diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ad988165eb..afc4060044 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -29,14 +29,15 @@ using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
+using System.Reflection;
using System.Xml;
using System.IO;
+using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework.Console;
-
namespace OpenSim.Framework
{
public class RegionLightShareData : ICloneable
@@ -96,10 +97,9 @@ namespace OpenSim.Framework
[Serializable]
public class SimpleRegionInfo
- {
- // private static readonly log4net.ILog m_log
- // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
+ {
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
///
/// The port by which http communication occurs with the region (most noticeably, CAPS communication)
///
@@ -327,8 +327,7 @@ namespace OpenSim.Framework
public class RegionInfo
{
- // private static readonly log4net.ILog m_log
- // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public bool commFailTF = false;
public ConfigurationMember configMember;
@@ -772,9 +771,16 @@ namespace OpenSim.Framework
}
if (externalName == "SYSTEMIP")
+ {
m_externalHostName = Util.GetLocalHost().ToString();
+ m_log.InfoFormat(
+ "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}",
+ m_externalHostName, name);
+ }
else
+ {
m_externalHostName = externalName;
+ }
m_regionType = config.GetString("RegionType", String.Empty);
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index a6e00c2251..8123f2fed7 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
catch (Exception e)
{
- m_log.Error(string.Format("[BASE HTTP SERVER]: OnRequest() failed with "), e);
+ m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
}
}
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 94862a6372..e20866eaa3 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
}
catch (Exception ex)
{
- m_log.Warn("GET from URL " + url + " failed: " + ex.Message);
+ m_log.Warn(httpVerb + " on URL " + url + " failed: " + ex.Message);
errorMessage = ex.Message;
}
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 75561a7d52..cb48ac1190 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -192,9 +192,7 @@ namespace OpenSim
// Hook up to the watchdog timer
Watchdog.OnWatchdogTimeout += WatchdogTimeoutHandler;
- PrintFileToConsole("startuplogo.txt");
-
- m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString());
+ PrintFileToConsole("startuplogo.txt");
// For now, start at the 'root' level by default
if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 904e38a521..ce7b0ebc47 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -659,7 +659,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!Entities.Remove(agentID))
{
m_log.WarnFormat(
- "[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list",
+ "[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene Entities list",
agentID);
}
@@ -668,12 +668,13 @@ namespace OpenSim.Region.Framework.Scenes
{
Dictionary newmap = new Dictionary(m_scenePresenceMap);
List newlist = new List(m_scenePresenceArray);
-
- // Remember the old presene reference from the dictionary
- ScenePresence oldref = newmap[agentID];
+
// Remove the presence reference from the dictionary
- if (newmap.Remove(agentID))
+ if (newmap.ContainsKey(agentID))
{
+ ScenePresence oldref = newmap[agentID];
+ newmap.Remove(agentID);
+
// Find the index in the list where the old ref was stored and remove the reference
newlist.RemoveAt(newlist.IndexOf(oldref));
// Swap out the dictionary and list with new references
@@ -682,7 +683,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
- m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
+ m_log.WarnFormat("[SCENE]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
}
}
finally
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 3fdee9c8b4..34bb8b38c8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -371,18 +371,33 @@ namespace OpenSim.Services.Connectors.SimianGrid
///
public bool Delete(string id)
{
+ string errorMessage = String.Empty;
+ string url = m_serverUrl + id;
+
if (m_cache != null)
m_cache.Expire(id);
- string url = m_serverUrl + id;
+ try
+ {
+ HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
+ request.Method = "DELETE";
+
+ using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+ {
+ if (response.StatusCode != HttpStatusCode.NoContent)
+ {
+ m_log.Warn("[SIMIAN ASSET CONNECTOR]: Unexpected response when deleting asset " + url + ": " +
+ response.StatusCode + " (" + response.StatusDescription + ")");
+ }
+ }
- OSDMap response = WebUtil.ServiceRequest(url, "DELETE");
- if (response["Success"].AsBoolean())
return true;
- else
- m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service");
-
- return false;
+ }
+ catch (Exception ex)
+ {
+ m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service: " + ex.Message);
+ return false;
+ }
}
#endregion IAssetService