aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/UserLoginService.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-18 18:48:55 +0000
committerJustin Clarke Casey2008-02-18 18:48:55 +0000
commit359f84ee43d93b45610eb7fab308b8f1675a4d60 (patch)
tree2471562467aaac5acaf24a39c96f8fd621ec60f1 /OpenSim/Grid/UserServer/UserLoginService.cs
parent* Fixed a land manager exception or two with Math.Max(255,Math.Min(0,val)) (diff)
downloadopensim-SC_OLD-359f84ee43d93b45610eb7fab308b8f1675a4d60.zip
opensim-SC_OLD-359f84ee43d93b45610eb7fab308b8f1675a4d60.tar.gz
opensim-SC_OLD-359f84ee43d93b45610eb7fab308b8f1675a4d60.tar.bz2
opensim-SC_OLD-359f84ee43d93b45610eb7fab308b8f1675a4d60.tar.xz
* Output XmlRpc error message if user server gets a fault response from the region server on login
* This will make it more obvious if one accidentally starts one's region server in standalone rather than grid mode but then tries to login to a grid (as I am wont to do) * We are now sending back a fault code (-32601) if no xmlrpc method is found rather than an ordinary message
Diffstat (limited to 'OpenSim/Grid/UserServer/UserLoginService.cs')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 58e85d8..11eaa5f 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -130,12 +130,19 @@ namespace OpenSim.Grid.UserServer
130 theUser.currentAgent.currentRegion = SimInfo.UUID; 130 theUser.currentAgent.currentRegion = SimInfo.UUID;
131 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 131 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
132 132
133 m_log.Info("[LOGIN]: Sending expect user call to " 133 m_log.Info("[LOGIN]: Telling "
134 + SimInfo.regionName + " @ " + SimInfo.httpServerURI + " " + 134 + SimInfo.regionName + " @ " + SimInfo.httpServerURI + " " +
135 SimInfo.regionLocX + "," + SimInfo.regionLocY); 135 SimInfo.regionLocX + "," + SimInfo.regionLocY + " to expect user connection");
136 136
137 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 137 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
138 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 138 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
139
140 if (GridResp.IsFault)
141 {
142 m_log.ErrorFormat(
143 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
144 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
145 }
139 } 146 }
140 catch (Exception) 147 catch (Exception)
141 { 148 {