diff options
author | Diva Canto | 2009-09-24 13:33:58 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-24 13:33:58 -0700 |
commit | dd3d52ae1faefbca85e2fe8d8cea67f7db4005ac (patch) | |
tree | 659b977f1ab6b7fd5def36fe8c967953dc1edeb5 /OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-dd3d52ae1faefbca85e2fe8d8cea67f7db4005ac.zip opensim-SC_OLD-dd3d52ae1faefbca85e2fe8d8cea67f7db4005ac.tar.gz opensim-SC_OLD-dd3d52ae1faefbca85e2fe8d8cea67f7db4005ac.tar.bz2 opensim-SC_OLD-dd3d52ae1faefbca85e2fe8d8cea67f7db4005ac.tar.xz |
Added test GridClient, which allowed me to remove a few bugs out of the new code.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 0a867db..fa197c8 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
@@ -97,9 +97,11 @@ namespace OpenSim.Services.Connectors | |||
97 | 97 | ||
98 | sendData["METHOD"] = "register"; | 98 | sendData["METHOD"] = "register"; |
99 | 99 | ||
100 | string reqString = ServerUtils.BuildQueryString(sendData); | ||
101 | m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString); | ||
100 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 102 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", |
101 | m_ServerURI + "/grid", | 103 | m_ServerURI + "/grid", |
102 | ServerUtils.BuildQueryString(sendData)); | 104 | reqString); |
103 | 105 | ||
104 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 106 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
105 | 107 | ||
@@ -138,9 +140,10 @@ namespace OpenSim.Services.Connectors | |||
138 | 140 | ||
139 | sendData["METHOD"] = "get_neighbours"; | 141 | sendData["METHOD"] = "get_neighbours"; |
140 | 142 | ||
143 | string reqString = ServerUtils.BuildQueryString(sendData); | ||
141 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 144 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", |
142 | m_ServerURI + "/grid", | 145 | m_ServerURI + "/grid", |
143 | ServerUtils.BuildQueryString(sendData)); | 146 | reqString); |
144 | 147 | ||
145 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 148 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
146 | 149 | ||
@@ -148,6 +151,7 @@ namespace OpenSim.Services.Connectors | |||
148 | if (replyData != null) | 151 | if (replyData != null) |
149 | { | 152 | { |
150 | Dictionary<string, object>.ValueCollection rinfosList = replyData.Values; | 153 | Dictionary<string, object>.ValueCollection rinfosList = replyData.Values; |
154 | m_log.DebugFormat("[GRID CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count); | ||
151 | foreach (object r in rinfosList) | 155 | foreach (object r in rinfosList) |
152 | { | 156 | { |
153 | if (r is Dictionary<string, object>) | 157 | if (r is Dictionary<string, object>) |
@@ -156,8 +160,8 @@ namespace OpenSim.Services.Connectors | |||
156 | rinfos.Add(rinfo); | 160 | rinfos.Add(rinfo); |
157 | } | 161 | } |
158 | else | 162 | else |
159 | m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response", | 163 | m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response type {2}", |
160 | scopeID, regionID); | 164 | scopeID, regionID, r.GetType()); |
161 | } | 165 | } |
162 | } | 166 | } |
163 | else | 167 | else |