diff options
author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | Merge branch 'master' into httptests (diff) | |
parent | Massive tab and trailing space cleanup (diff) | |
download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz |
fix merge
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 541b658..5111673 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -71,9 +71,9 @@ namespace OpenSim.Framework.Servers | |||
71 | 71 | ||
72 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; | 72 | private int m_periodDiagnosticTimerMS = 60 * 60 * 1000; |
73 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); | 73 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); |
74 | 74 | ||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Random uuid for private data | 76 | /// Random uuid for private data |
77 | /// </summary> | 77 | /// </summary> |
78 | protected string m_osSecret = String.Empty; | 78 | protected string m_osSecret = String.Empty; |
79 | 79 | ||
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Servers | |||
88 | // Random uuid for private data | 88 | // Random uuid for private data |
89 | m_osSecret = UUID.Random().ToString(); | 89 | m_osSecret = UUID.Random().ToString(); |
90 | } | 90 | } |
91 | 91 | ||
92 | private static bool m_NoVerifyCertChain = false; | 92 | private static bool m_NoVerifyCertChain = false; |
93 | private static bool m_NoVerifyCertHostname = false; | 93 | private static bool m_NoVerifyCertHostname = false; |
94 | 94 | ||
@@ -132,10 +132,10 @@ namespace OpenSim.Framework.Servers | |||
132 | m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS; | 132 | m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS; |
133 | m_periodicDiagnosticsTimer.Enabled = true; | 133 | m_periodicDiagnosticsTimer.Enabled = true; |
134 | } | 134 | } |
135 | } | 135 | } |
136 | 136 | ||
137 | protected override void ShutdownSpecific() | 137 | protected override void ShutdownSpecific() |
138 | { | 138 | { |
139 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); | 139 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); |
140 | 140 | ||
141 | RemovePIDFile(); | 141 | RemovePIDFile(); |
@@ -145,12 +145,12 @@ namespace OpenSim.Framework.Servers | |||
145 | if (!SuppressExit) | 145 | if (!SuppressExit) |
146 | Environment.Exit(0); | 146 | Environment.Exit(0); |
147 | } | 147 | } |
148 | 148 | ||
149 | /// <summary> | 149 | /// <summary> |
150 | /// Provides a list of help topics that are available. Overriding classes should append their topics to the | 150 | /// Provides a list of help topics that are available. Overriding classes should append their topics to the |
151 | /// information returned when the base method is called. | 151 | /// information returned when the base method is called. |
152 | /// </summary> | 152 | /// </summary> |
153 | /// | 153 | /// |
154 | /// <returns> | 154 | /// <returns> |
155 | /// A list of strings that represent different help topics on which more information is available | 155 | /// A list of strings that represent different help topics on which more information is available |
156 | /// </returns> | 156 | /// </returns> |
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Servers | |||
176 | public virtual void Startup() | 176 | public virtual void Startup() |
177 | { | 177 | { |
178 | m_log.Info("[STARTUP]: Beginning startup processing"); | 178 | m_log.Info("[STARTUP]: Beginning startup processing"); |
179 | 179 | ||
180 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); | 180 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); |
181 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 181 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
182 | // the clr version number doesn't match the project version number under Mono. | 182 | // the clr version number doesn't match the project version number under Mono. |
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Servers | |||
184 | m_log.InfoFormat( | 184 | m_log.InfoFormat( |
185 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", | 185 | "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", |
186 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); | 186 | Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); |
187 | 187 | ||
188 | try | 188 | try |
189 | { | 189 | { |
190 | StartupSpecific(); | 190 | StartupSpecific(); |
@@ -195,18 +195,18 @@ namespace OpenSim.Framework.Servers | |||
195 | (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message ); | 195 | (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message ); |
196 | Environment.Exit(1); | 196 | Environment.Exit(1); |
197 | } | 197 | } |
198 | 198 | ||
199 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 199 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
200 | 200 | ||
201 | // MainConsole.Instance.OutputFormat( | 201 | // MainConsole.Instance.OutputFormat( |
202 | // "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", | 202 | // "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", |
203 | // timeTaken.Minutes, timeTaken.Seconds); | 203 | // timeTaken.Minutes, timeTaken.Seconds); |
204 | } | 204 | } |
205 | 205 | ||
206 | public string osSecret | 206 | public string osSecret |
207 | { | 207 | { |
208 | // Secret uuid for the simulator | 208 | // Secret uuid for the simulator |
209 | get { return m_osSecret; } | 209 | get { return m_osSecret; } |
210 | } | 210 | } |
211 | 211 | ||
212 | public string StatReport(IOSHttpRequest httpRequest) | 212 | public string StatReport(IOSHttpRequest httpRequest) |
@@ -215,8 +215,8 @@ namespace OpenSim.Framework.Servers | |||
215 | if (httpRequest.Query.ContainsKey("callback")) | 215 | if (httpRequest.Query.ContainsKey("callback")) |
216 | { | 216 | { |
217 | return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");"; | 217 | return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");"; |
218 | } | 218 | } |
219 | else | 219 | else |
220 | { | 220 | { |
221 | return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version); | 221 | return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version); |
222 | } | 222 | } |