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

Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.

0.7.4.1
Justin Clark-Casey (justincc) 2012-04-10 20:40:59 +01:00
parent fb44e7b636
commit 4ab479bf58
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
View File

@ -113,29 +113,36 @@ namespace OpenSim.Services.Connectors
} }
else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure")) else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure"))
{ {
m_log.DebugFormat("[GRID CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString()); m_log.ErrorFormat(
"[GRID CONNECTOR]: Registration failed: {0} when contacting {1}", replyData["Message"], uri);
return replyData["Message"].ToString(); return replyData["Message"].ToString();
} }
else if (!replyData.ContainsKey("Result")) else if (!replyData.ContainsKey("Result"))
{ {
m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field"); m_log.ErrorFormat(
"[GRID CONNECTOR]: reply data does not contain result field when contacting {0}", uri);
} }
else else
{ {
m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString()); m_log.ErrorFormat(
return "Unexpected result "+replyData["Result"].ToString(); "[GRID CONNECTOR]: unexpected result {0} when contacting {1}", replyData["Result"], uri);
return "Unexpected result " + replyData["Result"].ToString();
} }
} }
else else
m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply"); {
m_log.ErrorFormat(
"[GRID CONNECTOR]: RegisterRegion received null reply when contacting grid server at {0}", uri);
}
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message); m_log.ErrorFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
} }
return "Error communicating with grid service"; return string.Format("Error communicating with the grid service at {0}", uri);
} }
public bool DeregisterRegion(UUID regionID) public bool DeregisterRegion(UUID regionID)