diff options
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 828a852..60702d4 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -65,8 +65,12 @@ namespace OpenSim.Framework.Servers | |||
65 | /// This will control a periodic log printout of the current 'show stats' (if they are active) for this | 65 | /// This will control a periodic log printout of the current 'show stats' (if they are active) for this |
66 | /// server. | 66 | /// server. |
67 | /// </summary> | 67 | /// </summary> |
68 | <<<<<<< HEAD | ||
68 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; | 69 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; |
69 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); | 70 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); |
71 | ======= | ||
72 | // private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); | ||
73 | >>>>>>> avn/ubitvar | ||
70 | 74 | ||
71 | /// <summary> | 75 | /// <summary> |
72 | /// Random uuid for private data | 76 | /// Random uuid for private data |
@@ -84,6 +88,11 @@ namespace OpenSim.Framework.Servers | |||
84 | // Random uuid for private data | 88 | // Random uuid for private data |
85 | m_osSecret = UUID.Random().ToString(); | 89 | m_osSecret = UUID.Random().ToString(); |
86 | 90 | ||
91 | <<<<<<< HEAD | ||
92 | ======= | ||
93 | // m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics); | ||
94 | // m_periodicDiagnosticsTimer.Enabled = true; | ||
95 | >>>>>>> avn/ubitvar | ||
87 | } | 96 | } |
88 | 97 | ||
89 | /// <summary> | 98 | /// <summary> |
@@ -146,14 +155,24 @@ namespace OpenSim.Framework.Servers | |||
146 | /// Performs initialisation of the scene, such as loading configuration from disk. | 155 | /// Performs initialisation of the scene, such as loading configuration from disk. |
147 | /// </summary> | 156 | /// </summary> |
148 | public virtual void Startup() | 157 | public virtual void Startup() |
149 | { | 158 | { |
159 | m_log.Info("[STARTUP]: Beginning startup processing"); | ||
160 | |||
161 | m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine); | ||
162 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | ||
163 | // the clr version number doesn't match the project version number under Mono. | ||
164 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | ||
165 | m_log.InfoFormat( | ||
166 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", | ||
167 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); | ||
168 | |||
150 | StartupSpecific(); | 169 | StartupSpecific(); |
151 | 170 | ||
152 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 171 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
153 | 172 | ||
154 | MainConsole.Instance.OutputFormat( | 173 | // MainConsole.Instance.OutputFormat( |
155 | "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", | 174 | // "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", |
156 | timeTaken.Minutes, timeTaken.Seconds); | 175 | // timeTaken.Minutes, timeTaken.Seconds); |
157 | } | 176 | } |
158 | 177 | ||
159 | public string osSecret | 178 | public string osSecret |
@@ -175,4 +194,4 @@ namespace OpenSim.Framework.Servers | |||
175 | } | 194 | } |
176 | } | 195 | } |
177 | } | 196 | } |
178 | } \ No newline at end of file | 197 | } |