aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs20
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs2
3 files changed, 15 insertions, 9 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ad98816..afc4060 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -29,14 +29,15 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets; 31using System.Net.Sockets;
32using System.Reflection;
32using System.Xml; 33using System.Xml;
33using System.IO; 34using System.IO;
35using log4net;
34using Nini.Config; 36using Nini.Config;
35using OpenMetaverse; 37using OpenMetaverse;
36using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
37using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
38 40
39
40namespace OpenSim.Framework 41namespace OpenSim.Framework
41{ 42{
42 public class RegionLightShareData : ICloneable 43 public class RegionLightShareData : ICloneable
@@ -96,10 +97,9 @@ namespace OpenSim.Framework
96 97
97 [Serializable] 98 [Serializable]
98 public class SimpleRegionInfo 99 public class SimpleRegionInfo
99 { 100 {
100 // private static readonly log4net.ILog m_log 101// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
101 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 102
102
103 /// <summary> 103 /// <summary>
104 /// The port by which http communication occurs with the region (most noticeably, CAPS communication) 104 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
105 /// </summary> 105 /// </summary>
@@ -327,8 +327,7 @@ namespace OpenSim.Framework
327 327
328 public class RegionInfo 328 public class RegionInfo
329 { 329 {
330 // private static readonly log4net.ILog m_log 330 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
331 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
332 331
333 public bool commFailTF = false; 332 public bool commFailTF = false;
334 public ConfigurationMember configMember; 333 public ConfigurationMember configMember;
@@ -772,9 +771,16 @@ namespace OpenSim.Framework
772 } 771 }
773 772
774 if (externalName == "SYSTEMIP") 773 if (externalName == "SYSTEMIP")
774 {
775 m_externalHostName = Util.GetLocalHost().ToString(); 775 m_externalHostName = Util.GetLocalHost().ToString();
776 m_log.InfoFormat(
777 "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}",
778 m_externalHostName, name);
779 }
776 else 780 else
781 {
777 m_externalHostName = externalName; 782 m_externalHostName = externalName;
783 }
778 784
779 m_regionType = config.GetString("RegionType", String.Empty); 785 m_regionType = config.GetString("RegionType", String.Empty);
780 786
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index a6e00c2..8123f2f 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer
310 } 310 }
311 catch (Exception e) 311 catch (Exception e)
312 { 312 {
313 m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e); 313 m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
314 } 314 }
315 } 315 }
316 316
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 94862a6..e20866e 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
114 } 114 }
115 catch (Exception ex) 115 catch (Exception ex)
116 { 116 {
117 m_log.Warn("GET from URL " + url + " failed: " + ex.Message); 117 m_log.Warn(httpVerb + " on URL " + url + " failed: " + ex.Message);
118 errorMessage = ex.Message; 118 errorMessage = ex.Message;
119 } 119 }
120 120