OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages 

These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-19 01:16:07 +00:00
parent 011c1279f5
commit 2593a446ac
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/IRegionData.cs
View File

@ -54,12 +54,12 @@ namespace OpenSim.Data
/// <summary> /// <summary>
/// Return the x-coordinate of this region. /// Return the x-coordinate of this region.
/// </summary> /// </summary>
public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } } public int coordX { get { return posX / (int)Constants.RegionSize; } }
/// <summary> /// <summary>
/// Return the y-coordinate of this region. /// Return the y-coordinate of this region.
/// </summary> /// </summary>
public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } } public int coordY { get { return posY / (int)Constants.RegionSize; } }
public Dictionary<string, object> Data; public Dictionary<string, object> Data;
} }

2
OpenSim/Framework/WebUtil.cs
View File

@ -297,7 +297,7 @@ namespace OpenSim.Framework
catch (Exception e) catch (Exception e)
{ {
// don't need to treat this as an error... we're just guessing anyway // don't need to treat this as an error... we're just guessing anyway
m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); // m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
} }
return result; return result;

8
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -177,7 +177,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// We're ignoring a collection was modified error because this data gets old and outdated fast. // We're ignoring a collection was modified error because this data gets old and outdated fast.
} }
} }
/// <summary> /// <summary>
@ -185,13 +184,18 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) protected void SendCloseChildAgent(UUID agentID, ulong regionHandle)
{ {
m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle);
// let's do our best, but there's not much we can do if the neighbour doesn't accept. // let's do our best, but there's not much we can do if the neighbour doesn't accept.
//m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
uint x = 0, y = 0; uint x = 0, y = 0;
Utils.LongToUInts(regionHandle, out x, out y); Utils.LongToUInts(regionHandle, out x, out y);
GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
m_log.DebugFormat(
"[INTERGRID]: Sending close agent {0} to region at {1}-{2}",
agentID, destination.RegionCoordX, destination.RegionCoordY);
m_scene.SimulationService.CloseAgent(destination, agentID); m_scene.SimulationService.CloseAgent(destination, agentID);
} }

3
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -220,14 +220,13 @@ namespace OpenSim.Server.Handlers.Simulation
responsedata["int_response_code"] = HttpStatusCode.OK; responsedata["int_response_code"] = HttpStatusCode.OK;
responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
m_log.Debug("[AGENT HANDLER]: Agent Released/Deleted."); m_log.DebugFormat("[AGENT HANDLER]: Agent {0} Released/Deleted from region {1}", id, regionID);
} }
protected virtual void ReleaseAgent(UUID regionID, UUID id) protected virtual void ReleaseAgent(UUID regionID, UUID id)
{ {
m_SimulationService.ReleaseAgent(regionID, id, ""); m_SimulationService.ReleaseAgent(regionID, id, "");
} }
} }
public class AgentPostHandler : BaseStreamHandler public class AgentPostHandler : BaseStreamHandler

4
OpenSim/Services/GridService/GridService.cs
View File

@ -244,7 +244,7 @@ namespace OpenSim.Services.GridService
return false; return false;
m_log.DebugFormat( m_log.DebugFormat(
"[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}", "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
region.RegionName, region.RegionID, region.coordX, region.coordY); region.RegionName, region.RegionID, region.coordX, region.coordY);
int flags = Convert.ToInt32(region.Data["flags"]); int flags = Convert.ToInt32(region.Data["flags"]);
@ -291,7 +291,7 @@ namespace OpenSim.Services.GridService
} }
} }
m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count); // m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
} }
else else
{ {