From 359f84ee43d93b45610eb7fab308b8f1675a4d60 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 18 Feb 2008 18:48:55 +0000 Subject: * 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 --- OpenSim/Grid/UserServer/UserLoginService.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'OpenSim/Grid') 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 theUser.currentAgent.currentRegion = SimInfo.UUID; theUser.currentAgent.currentHandle = SimInfo.regionHandle; - m_log.Info("[LOGIN]: Sending expect user call to " + m_log.Info("[LOGIN]: Telling " + SimInfo.regionName + " @ " + SimInfo.httpServerURI + " " + - SimInfo.regionLocX + "," + SimInfo.regionLocY); + SimInfo.regionLocX + "," + SimInfo.regionLocY + " to expect user connection"); XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); + + if (GridResp.IsFault) + { + m_log.ErrorFormat( + "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", + SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); + } } catch (Exception) { -- cgit v1.1