OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applying a modified version of TomTheDragon's patch to prevent the sim 

from crashing when signals are unavailable.
melanie
Melanie Thielker 2016-12-12 09:26:12 +00:00
parent da2c1e8aad
commit cdfdf6322d
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Application/OpenSim.cs
View File

@ -131,7 +131,6 @@ namespace OpenSim
private Thread signal_thread = new Thread (delegate () private Thread signal_thread = new Thread (delegate ()
{ {
System.Console.WriteLine("------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------");
while (true) while (true)
{ {
// Wait for a signal to be delivered // Wait for a signal to be delivered
@ -152,15 +151,23 @@ namespace OpenSim
m_log.Info("===================================================================="); m_log.Info("====================================================================");
if(!Util.IsWindows()) if(!Util.IsWindows())
{
try
{ {
// linux mac os specifics // linux mac os specifics
signals = new Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[]
{ {
// new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT),
new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM)
}; };
signal_thread.Start(); 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);
}
}
//m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
// http://msdn.microsoft.com/en-us/library/bb384202.aspx // http://msdn.microsoft.com/en-us/library/bb384202.aspx
//GCSettings.LatencyMode = GCLatencyMode.Batch; //GCSettings.LatencyMode = GCLatencyMode.Batch;