ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-04-25 17:59:53 +01:00
parent 45695ef2e3 7c5376f224
commit a680d8b8d7
111 changed files with 17583 additions and 2491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,9 @@ namespace OpenSim.Server.Base
//
private bool m_Running = true;
private static Mono.Unix.UnixSignal[] signals;
// Handle all the automagical stuff
//
public ServicesServerBase(string prompt, string[] args) : base()
@@ -183,6 +186,39 @@ namespace OpenSim.Server.Base
RegisterCommonCommands();
RegisterCommonComponents(Config);
Thread signal_thread = new Thread (delegate ()
{
while (true)
{
// Wait for a signal to be delivered
int index = Mono.Unix.UnixSignal.WaitAny (signals, -1);
//Mono.Unix.Native.Signum signal = signals [index].Signum;
ShutdownSpecific();
m_Running = false;
Environment.Exit(0);
}
});
if(!Util.IsWindows())
{
try
{
// linux mac os specifics
signals = new Mono.Unix.UnixSignal[]
{
new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM)
};
signal_thread.Start();
}
catch (Exception e)
{
m_log.Info("Could not set up UNIX signal handlers. SIGTERM will not");
m_log.InfoFormat("shut down gracefully: {0}", e.Message);
m_log.Debug("Exception was: ", e);
}
}
// Allow derived classes to perform initialization that
// needs to be done after the console has opened
Initialise();