ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.

Browse Source
This commit is contained in:
Jeff Ames
2008-06-13 00:21:53 +00:00
parent 1451d6fb9a
commit 64f01ade04
11 changed files with 74 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/MessageServerConfig.cs
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("default_user_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default User Server URI",
"http://127.0.0.1:8002" + "/", false);
"http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false);
configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to user server", "null", false);
configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -71,7 +71,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("default_grid_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Grid Server URI",
"http://127.0.0.1:8001/", false);
"http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to grid server", "null", false);
configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

22
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -47,14 +47,14 @@ namespace OpenSim.Framework.Servers
/// server.
/// </summary>
private Timer m_periodicLogStatsTimer = new Timer(60 * 60 * 1000);
protected ConsoleBase m_console;
/// <summary>
/// Time at which this server was started
/// </summary>
protected DateTime m_startuptime;
/// <summary>
/// Record the initial startup directory for info purposes
/// </summary>
@@ -80,11 +80,11 @@ namespace OpenSim.Framework.Servers
{
m_startuptime = DateTime.Now;
m_version = VersionInfo.Version;
m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats);
m_periodicLogStatsTimer.Elapsed += new ElapsedEventHandler(LogStats);
m_periodicLogStatsTimer.Enabled = true;
}
/// <summary>
/// Print statistics to the logfile, if they are active
/// </summary>
@@ -93,7 +93,7 @@ namespace OpenSim.Framework.Servers
if (m_stats != null)
{
m_log.Info(m_stats.Report());
}
}
}
/// <summary>
@@ -131,10 +131,10 @@ namespace OpenSim.Framework.Servers
Notice("quit - equivalent to shutdown.");
Notice("show info - show server information (e.g. startup path).");
if (m_stats != null)
Notice("show stats - show statistical information for this server");
Notice("show uptime - show server startup time and uptime.");
Notice("show version - show server version.");
Notice("shutdown - shutdown the server.\n");
@@ -165,9 +165,9 @@ namespace OpenSim.Framework.Servers
{
case "info":
Notice("Version: " + m_version );
Notice("Startup directory: " + m_startupDirectory);
Notice("Startup directory: " + m_startupDirectory);
break;
case "stats":
if (m_stats != null)
{
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Servers
{
OSString = Util.ReadEtcIssue();
}
if (OSString.Length > 45)
{
OSString = OSString.Substring(0, 45);