diff options
author | Justin Clark-Casey (justincc) | 2012-04-10 20:40:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-10 20:40:59 +0100 |
commit | 4ab479bf58652573606fa08136e182260b180a0b (patch) | |
tree | 80f7f1337606eb934460e18efedb0773b2ac7383 /OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |
parent | minor: convert tabs to spaces in config example files from recent 7c534e5 (diff) | |
download | opensim-SC_OLD-4ab479bf58652573606fa08136e182260b180a0b.zip opensim-SC_OLD-4ab479bf58652573606fa08136e182260b180a0b.tar.gz opensim-SC_OLD-4ab479bf58652573606fa08136e182260b180a0b.tar.bz2 opensim-SC_OLD-4ab479bf58652573606fa08136e182260b180a0b.tar.xz |
Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 1599a56..34ed0d7 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
@@ -113,29 +113,36 @@ namespace OpenSim.Services.Connectors | |||
113 | } | 113 | } |
114 | else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure")) | 114 | else if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "failure")) |
115 | { | 115 | { |
116 | m_log.DebugFormat("[GRID CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString()); | 116 | m_log.ErrorFormat( |
117 | "[GRID CONNECTOR]: Registration failed: {0} when contacting {1}", replyData["Message"], uri); | ||
118 | |||
117 | return replyData["Message"].ToString(); | 119 | return replyData["Message"].ToString(); |
118 | } | 120 | } |
119 | else if (!replyData.ContainsKey("Result")) | 121 | else if (!replyData.ContainsKey("Result")) |
120 | { | 122 | { |
121 | m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field"); | 123 | m_log.ErrorFormat( |
124 | "[GRID CONNECTOR]: reply data does not contain result field when contacting {0}", uri); | ||
122 | } | 125 | } |
123 | else | 126 | else |
124 | { | 127 | { |
125 | m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString()); | 128 | m_log.ErrorFormat( |
126 | return "Unexpected result "+replyData["Result"].ToString(); | 129 | "[GRID CONNECTOR]: unexpected result {0} when contacting {1}", replyData["Result"], uri); |
130 | |||
131 | return "Unexpected result " + replyData["Result"].ToString(); | ||
127 | } | 132 | } |
128 | |||
129 | } | 133 | } |
130 | else | 134 | else |
131 | m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply"); | 135 | { |
136 | m_log.ErrorFormat( | ||
137 | "[GRID CONNECTOR]: RegisterRegion received null reply when contacting grid server at {0}", uri); | ||
138 | } | ||
132 | } | 139 | } |
133 | catch (Exception e) | 140 | catch (Exception e) |
134 | { | 141 | { |
135 | m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message); | 142 | m_log.ErrorFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message); |
136 | } | 143 | } |
137 | 144 | ||
138 | return "Error communicating with grid service"; | 145 | return string.Format("Error communicating with the grid service at {0}", uri); |
139 | } | 146 | } |
140 | 147 | ||
141 | public bool DeregisterRegion(UUID regionID) | 148 | public bool DeregisterRegion(UUID regionID) |