diff options
| author | UbitUmarov | 2017-05-24 22:17:04 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-24 22:17:04 +0100 |
| commit | dca3a45803a18103113b9eb861da4f79572de924 (patch) | |
| tree | 71b2dad54f62c9e0ff5e0df5383c2d7be5121520 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | mantis 8780 replace ode bins for linux with ones compiled against older Glibc... (diff) | |
| download | opensim-SC-dca3a45803a18103113b9eb861da4f79572de924.zip opensim-SC-dca3a45803a18103113b9eb861da4f79572de924.tar.gz opensim-SC-dca3a45803a18103113b9eb861da4f79572de924.tar.bz2 opensim-SC-dca3a45803a18103113b9eb861da4f79572de924.tar.xz | |
add a bit more pre exit cleanup
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 7d21e00..bc68681 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -108,16 +108,16 @@ namespace OpenSim.Framework.Servers | |||
| 108 | 108 | ||
| 109 | protected override void ShutdownSpecific() | 109 | protected override void ShutdownSpecific() |
| 110 | { | 110 | { |
| 111 | 111 | Watchdog.Enabled = false; | |
| 112 | |||
| 113 | base.ShutdownSpecific(); | 112 | base.ShutdownSpecific(); |
| 114 | 113 | ||
| 115 | MainServer.Stop(); | 114 | MainServer.Stop(); |
| 116 | 115 | ||
| 117 | Thread.Sleep(5000); | 116 | Thread.Sleep(5000); |
| 118 | 117 | Util.StopThreadPool(); | |
| 119 | WorkManager.Stop(); | 118 | WorkManager.Stop(); |
| 120 | 119 | ||
| 120 | Thread.Sleep(1000); | ||
| 121 | RemovePIDFile(); | 121 | RemovePIDFile(); |
| 122 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); | 122 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); |
| 123 | 123 | ||