diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Server/Base/ServicesServerBase.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 7c8e6b7..667cef8 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -34,6 +34,7 @@ using System.Text; | |||
34 | using System.Xml; | 34 | using System.Xml; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Monitoring; | ||
37 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
38 | using log4net; | 39 | using log4net; |
39 | using log4net.Config; | 40 | using log4net.Config; |
@@ -171,11 +172,6 @@ namespace OpenSim.Server.Base | |||
171 | 172 | ||
172 | m_console = MainConsole.Instance; | 173 | m_console = MainConsole.Instance; |
173 | 174 | ||
174 | // Configure the appenders for log4net | ||
175 | // | ||
176 | OpenSimAppender consoleAppender = null; | ||
177 | FileAppender fileAppender = null; | ||
178 | |||
179 | if (logConfig != null) | 175 | if (logConfig != null) |
180 | { | 176 | { |
181 | FileInfo cfg = new FileInfo(logConfig); | 177 | FileInfo cfg = new FileInfo(logConfig); |
@@ -195,16 +191,7 @@ namespace OpenSim.Server.Base | |||
195 | } | 191 | } |
196 | 192 | ||
197 | RegisterCommonCommands(); | 193 | RegisterCommonCommands(); |
198 | 194 | RegisterCommonComponents(Config); | |
199 | // Register the quit command | ||
200 | // | ||
201 | MainConsole.Instance.Commands.AddCommand("General", false, "quit", | ||
202 | "quit", | ||
203 | "Quit the application", HandleQuit); | ||
204 | |||
205 | MainConsole.Instance.Commands.AddCommand("General", false, "shutdown", | ||
206 | "shutdown", | ||
207 | "Quit the application", HandleQuit); | ||
208 | 195 | ||
209 | // Allow derived classes to perform initialization that | 196 | // Allow derived classes to perform initialization that |
210 | // needs to be done after the console has opened | 197 | // needs to be done after the console has opened |
@@ -219,6 +206,9 @@ namespace OpenSim.Server.Base | |||
219 | 206 | ||
220 | public virtual int Run() | 207 | public virtual int Run() |
221 | { | 208 | { |
209 | Watchdog.Enabled = true; | ||
210 | MemoryWatchdog.Enabled = true; | ||
211 | |||
222 | while (m_Running) | 212 | while (m_Running) |
223 | { | 213 | { |
224 | try | 214 | try |
@@ -236,11 +226,12 @@ namespace OpenSim.Server.Base | |||
236 | return 0; | 226 | return 0; |
237 | } | 227 | } |
238 | 228 | ||
239 | protected virtual void HandleQuit(string module, string[] args) | 229 | protected override void ShutdownSpecific() |
240 | { | 230 | { |
241 | m_Running = false; | 231 | m_Running = false; |
242 | m_log.Info("[CONSOLE] Quitting"); | 232 | m_log.Info("[CONSOLE] Quitting"); |
243 | 233 | ||
234 | base.ShutdownSpecific(); | ||
244 | } | 235 | } |
245 | 236 | ||
246 | protected virtual void ReadConfig() | 237 | protected virtual void ReadConfig() |
@@ -251,4 +242,4 @@ namespace OpenSim.Server.Base | |||
251 | { | 242 | { |
252 | } | 243 | } |
253 | } | 244 | } |
254 | } | 245 | } \ No newline at end of file |