From 14a7ddb885a284f3e8b61be4f3a0fbc265ea5fbb Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 26 Mar 2014 08:56:56 +0200 Subject: [PATCH 1/2] Revert "Use log-rolling on the log files (once per day)" This reverts commit 8ecab21b379d34f97ac966b13e1605024364142b. --- bin/OpenSim.32BitLaunch.exe.config | 10 ++++++++-- bin/OpenSim.exe.config | 10 ++++++++-- bin/Robust.32BitLaunch.exe.config | 10 ++++++++-- bin/Robust.exe.config | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 25776f2475..5b7807a8e3 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config @@ -23,11 +23,17 @@ + + + + + diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 8b48156340..31f1064068 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config @@ -23,11 +23,17 @@ + + + + + diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index 3bae9ec45a..95061e1938 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config @@ -21,11 +21,17 @@ + + + + + diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 889a9647fc..b9e01f1bc7 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config @@ -21,11 +21,17 @@ + + + + + From 7a47c15edbbebd93fc3355dfed68c2d5f635c897 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 26 Mar 2014 21:31:16 +0200 Subject: [PATCH 2/2] - Increased the threadpool timeout to 10 minutes - Changed a few places that launch long-lasting threads to skip the timeout altogether --- .../Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 6 +++--- OpenSim/Framework/Util.cs | 2 +- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 7d4851652b..a750d8d870 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) Contributors, http://opensimulator.org/ * See CONTRIBUTORS.TXT for a full list of copyright holders. * @@ -560,7 +560,7 @@ namespace OpenSim.Groups // so we have the list of urls to send the notice to // this may take a long time... - Util.FireAndForget(delegate + Util.RunThreadNoTimeout(delegate { foreach (string u in urls) { @@ -571,7 +571,7 @@ namespace OpenSim.Groups hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID)); } } - }); + }, "AddGroupNotice", null); return true; } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ce4af8b458..c7a7341159 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -2031,7 +2031,7 @@ namespace OpenSim.Framework // Maps (ThreadFunc number -> Thread) private static ConcurrentDictionary activeThreads = new ConcurrentDictionary(); - private static readonly int THREAD_TIMEOUT = 60 * 1000; + private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000; // 10 minutes /// /// Finds threads in the main thread pool that have timed-out, and aborts them. diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index b270de9c89..c7bd3d0c73 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -963,10 +963,10 @@ namespace OpenSim.Region.CoreModules.Asset case "assets": con.Output("Ensuring assets are cached for all scenes."); - Util.FireAndForget(delegate { + Util.RunThreadNoTimeout(delegate { int assetReferenceTotal = TouchAllSceneAssets(true); con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); - }); + }, "TouchAllSceneAssets", null); break;