From dca3a45803a18103113b9eb861da4f79572de924 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 24 May 2017 22:17:04 +0100
Subject: add a bit more pre exit cleanup

---
 OpenSim/Server/Base/ServicesServerBase.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Server/Base')

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 4951776..8db97a8 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -249,6 +249,9 @@ namespace OpenSim.Server.Base
                 }
             }
 
+            MemoryWatchdog.Enabled = false;
+            Watchdog.Enabled = false;
+
             RemovePIDFile();
 
             return 0;
-- 
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/Server/Base/ServicesServerBase.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Server/Base')

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 8db97a8..2185727 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -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)
-- 
cgit v1.1


From 772c5b7db030eb95da8852d711323244cfa91ab4 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 25 May 2017 06:05:02 +0100
Subject: move assetsconnector threads to whatchdog; Abort all alive threads
 known to watchdog before exit

---
 OpenSim/Server/Base/ServicesServerBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server/Base')

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 2185727..176e876 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Server.Base
 
             MemoryWatchdog.Enabled = false;
             Watchdog.Enabled = false;
-
+            WorkManager.Stop();
             RemovePIDFile();
 
             return 0;
-- 
cgit v1.1