Merge branch 'melanie'

3 files changed, 43 insertions, 3 deletions

diff --git a/OpenSim/Framework/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index ee4707f..63ae361 100644
--- a/OpenSim/Framework/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -212,7 +212,17 @@ namespace OpenSim.Framework
             // Check that we are permitted to make calls to this endpoint.
             bool foundIpv4Address = false;
 
-            IPAddress[] addresses = Dns.GetHostAddresses(url.Host);
+            IPAddress[] addresses = null;
+            
+            try
+            {
+                addresses = Dns.GetHostAddresses(url.Host);
+            }
+            catch
+            {
+                // If there is a DNS error, we can't stop the script!
+                return true;
+            }
 
             foreach (IPAddress addr in addresses)
             {
@@ -253,4 +263,4 @@ namespace OpenSim.Framework
             return allowed;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 8965e71..f627ae6 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Framework.Servers
 
         protected OpenSimAppender m_consoleAppender;
         protected FileAppender m_logFileAppender;
+        protected FileAppender m_statsLogFileAppender;
 
         protected DateTime m_startuptime;
         protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -156,6 +157,10 @@ namespace OpenSim.Framework.Servers
                 {
                     m_logFileAppender = (FileAppender)appender;
                 }
+                else if (appender.Name == "StatsLogFileAppender")
+                {
+                    m_statsLogFileAppender = (FileAppender)appender;
+                }
             }
 
             if (null == m_consoleAppender)
@@ -185,6 +190,18 @@ namespace OpenSim.Framework.Servers
 
                 m_log.InfoFormat("[SERVER BASE]: Logging started to file {0}", m_logFileAppender.File);
             }
+
+            if (m_statsLogFileAppender != null && startupConfig != null)
+            {
+                string cfgStatsFileName = startupConfig.GetString("StatsLogFile", null);
+                if (cfgStatsFileName != null)
+                {
+                    m_statsLogFileAppender.File = cfgStatsFileName;
+                    m_statsLogFileAppender.ActivateOptions();
+                }
+
+                m_log.InfoFormat("[SERVER BASE]: Stats Logging started to file {0}", m_statsLogFileAppender.File);
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 9f5868b..0ec24e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1192,7 +1192,7 @@ namespace OpenSim.Framework
         {
             foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
             {
-                if (appender is FileAppender)
+                if (appender is FileAppender && appender.Name == "LogFileAppender")
                 {
                     return ((FileAppender)appender).File;
                 }
@@ -1201,6 +1201,19 @@ namespace OpenSim.Framework
             return "./OpenSim.log";
         }
 
+        public static string statsLogFile()
+        {
+            foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
+            {
+                if (appender is FileAppender && appender.Name == "StatsLogFileAppender")
+                {
+                    return ((FileAppender)appender).File;
+                }
+            }
+
+            return "./OpenSimStats.log";
+        }
+
         public static string logDir()
         {
             return Path.GetDirectoryName(logFile());