Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

7 files changed, 38 insertions, 14 deletions

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 7d48516..a750d8d 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 ce4af8b..c7a7341 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<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>();
 
-        private static readonly int THREAD_TIMEOUT = 60 * 1000;
+        private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000;    // 10 minutes
 
         /// <summary>
         /// 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 b270de9..c7bd3d0 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;
 
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 25776f2..5b7807a 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -23,11 +23,17 @@
       </layout>
     </appender>
 
+<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="OpenSim.32BitLaunch.log" />
-      <appendToFile value="true" />
+      <file value="log/OpenSim.32BitLaunch.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSim.32BitLaunch.log" />
+      <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
         <acceptOnMatch value="false"/>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 8b48156..31f1064 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -23,11 +23,17 @@
       </layout>
     </appender>
 
+<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="OpenSim.log" />
-      <appendToFile value="true" />
+      <file value="log/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSim.log" />
+      <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
         <acceptOnMatch value="false"/>
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index 3bae9ec..95061e1 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -21,11 +21,17 @@
       </layout>
     </appender>
 
+<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="Robust.32BitLaunch.log" />
-      <appendToFile value="true" />
+      <file value="log/Robust.32BitLaunch.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="Robust.32BitLaunch.log" />
+      <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
         <acceptOnMatch value="false"/>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 889a964..b9e01f1 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -21,11 +21,17 @@
       </layout>
     </appender>
 
+<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="Robust.log" />
-      <appendToFile value="true" />
+      <file value="log/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="Robust.log" />
+      <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
         <acceptOnMatch value="false"/>