ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:07:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-05-25 10:23:52 +01:00
parent c0bfaac0ac 31b4a31246
commit 2777995331
21 changed files with 124 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -211,6 +211,7 @@ namespace OpenSim.Server.Base
{
new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM)
};
ignal_thread.IsBackground = true;
signal_thread.Start();
}
catch (Exception e)
@@ -249,6 +250,9 @@ namespace OpenSim.Server.Base
}
}
MemoryWatchdog.Enabled = false;
Watchdog.Enabled = false;
WorkManager.Stop();
RemovePIDFile();
return 0;

6
OpenSim/Server/ServerMain.cs
View File

@@ -33,6 +33,7 @@ using System.Net;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Collections.Generic;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Server.Base;
@@ -188,6 +189,11 @@ namespace OpenSim.Server
int res = m_Server.Run();
if(m_Server != null)
m_Server.Shutdown();
Util.StopThreadPool();
Environment.Exit(res);
return 0;