Standardize the way WebRequests are made in the SimulationServiceConnector. Added

debugging calls for tracking performance of web requests.

1 files changed, 35 insertions, 29 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index a1d9167..6c69fec 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -283,46 +283,52 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
         {
-            HttpWebRequest AgentCreateRequest = null;
+            m_log.WarnFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start");
+
             myipaddress = String.Empty;
             reason = String.Empty;
 
-            if (SendRequest(destination, aCircuit, flags, out reason, out AgentCreateRequest))
+            if (destination == null)
             {
-                string response = GetResponse(AgentCreateRequest, out reason);
-                bool success = true;
-                UnpackResponse(response, out success, out reason, out myipaddress);
-                return success;
+                m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Given destination is null");
+                return false;
             }
 
-            return false;
-        }
-
-        protected void UnpackResponse(string response, out bool result, out string reason, out string ipaddress)
-        {
-            result = true;
-            reason = string.Empty;
-            ipaddress = string.Empty;
+            string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
 
-            if (!String.IsNullOrEmpty(response))
+            try
             {
-                try
-                {
-                    // we assume we got an OSDMap back
-                    OSDMap r = Util.GetOSDMap(response);
-                    result = r["success"].AsBoolean();
-                    reason = r["reason"].AsString();
-                    ipaddress = r["your_ip"].AsString();
-                }
-                catch (NullReferenceException e)
+                OSDMap args = aCircuit.PackAgentCircuitData();
+
+                args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
+                args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
+                args["destination_name"] = OSD.FromString(destination.RegionName);
+                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
+                args["teleport_flags"] = OSD.FromString(flags.ToString());
+
+                OSDMap result = WebUtil.PostToService(uri,args);
+                if (result["Success"].AsBoolean())
                 {
-                    m_log.InfoFormat("[GATEKEEPER SERVICE CONNECTOR]: exception on UnpackResponse of DoCreateChildAgentCall {0}", e.Message);
-                    reason = "Internal error";
-                    result = false;
+                    OSDMap unpacked = (OSDMap)result["_Result"];
+
+                    if (unpacked != null)
+                    {
+                        reason = unpacked["reason"].AsString();
+                        myipaddress = unpacked["your_ip"].AsString();
+                        return unpacked["success"].AsBoolean();
+                    }
                 }
+                
+                reason = result["Message"] != null ? result["Message"].AsString() : "error";
+                return false;
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[REMOTE SIMULATION CONNECTOR]: CreateAgent failed with exception: " + e.ToString());
+                reason = e.Message;
             }
-        }
-
 
+            return false;
+        }
     }
 }