From 8989e8ef3ac68fbf93090b4eeb999081d215d945 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 24 May 2017 02:19:25 +0100 Subject: give up on the code to stop AsyncCommandManager. It fails with many scripts running, and its only done deep on exit code. It is a backgroud thread should not block exit and never did --- OpenSim/Region/Application/Application.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 4bd2c28..447afb4 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -79,7 +79,7 @@ namespace OpenSim else { ServicePointManager.DefaultConnectionLimit = 12; - try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case crazy some mono decides to have it infinity + try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some crazy mono decides to have it infinity catch { } } -- cgit v1.1 From 8195cd5153d736b5b5412e3fc3b5d6458d617ea9 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 25 May 2017 02:24:15 +0100 Subject: another one --- OpenSim/Region/Application/OpenSim.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 524f2be..5977f40 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -143,7 +143,7 @@ namespace OpenSim //Mono.Unix.Native.Signum signal = signals [index].Signum; MainConsole.Instance.RunCommand("shutdown"); } - }); + }); #endif /// @@ -165,6 +165,7 @@ namespace OpenSim { new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM) }; + signal_thread.IsBackground = true; signal_thread.Start(); } catch (Exception e) @@ -485,6 +486,12 @@ namespace OpenSim RunCommandScript(m_shutdownCommandsFile); } + if (m_timedScript != "disabled") + { + m_scriptTimer.Dispose(); + m_timedScript = "disabled"; + } + base.ShutdownSpecific(); } -- cgit v1.1