From ea72745d43c2c6eced8329801ff8765746be7ddd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:18:47 +0000
Subject: Log the xml/ini regions config files that opensim loads from, and the
 regions that it loaded from them

This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
---
 .../Filesystem/RegionLoaderFileSystem.cs           | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework/RegionLoader/Filesystem')

diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 63e09ae..7cbd5ed 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -25,15 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using log4net;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using Nini.Config;
 
 namespace OpenSim.Framework.RegionLoader.Filesystem
 {
     public class RegionLoaderFileSystem : IRegionLoader
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         private IConfigSource m_configSource;
 
         public void SetIniConfigSource(IConfigSource configSource)
@@ -63,36 +67,48 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
             string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
             string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
 
+            // Create an empty Regions.ini if there are no existing config files.
             if (configFiles.Length == 0 && iniFiles.Length == 0)
-            {
+            {                
                 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
                 iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
             }
+            
+            m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
 
             List<RegionInfo> regionInfos = new List<RegionInfo>();
 
             int i = 0;
             foreach (string file in iniFiles)
             {
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+                
                 IConfigSource source = new IniConfigSource(file);
 
                 foreach (IConfig config in source.Configs)
-                {
-                    //m_log.Info("[REGIONLOADERFILESYSTEM]: Creating RegionInfo for " + config.Name);
+                {                   
                     RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
                     regionInfos.Add(regionInfo);
+                    
+                    m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+                    
                     i++;
                 }
             }
 
             foreach (string file in configFiles)
             {
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+                
                 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
                 regionInfos.Add(regionInfo);
+                
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+                
                 i++;
             }
 
             return regionInfos.ToArray();
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From d8e1c380e67512e0476b2a7b7441ae3acbb4606f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:36:58 +0000
Subject: minor: make it clearer in the log where we're loading region config
 files and not the regions themselves

---
 OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/RegionLoader/Filesystem')

diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 7cbd5ed..0aae4ff 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
                     RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
                     regionInfos.Add(regionInfo);
                     
-                    m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+                    m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
                     
                     i++;
                 }
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
                 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
                 regionInfos.Add(regionInfo);
                 
-                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+                m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
                 
                 i++;
             }
-- 
cgit v1.1