From 39f340e6875c55927fc9dbeb51af2357c7d28c04 Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Mon, 24 Mar 2008 01:37:00 +0000
Subject: XmlRpcCommand refactoring

---
 OpenSim/Framework/Util.cs                 | 13 +++++++++++
 OpenSim/Grid/GridServer/GridServerBase.cs |  2 +-
 OpenSim/Region/Application/OpenSimMain.cs | 37 ++-----------------------------
 3 files changed, 16 insertions(+), 36 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 6c95c88..a184f89 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -35,6 +35,7 @@ using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
 using Nini.Config;
+using Nwc.XmlRpc;
 
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -605,5 +606,17 @@ namespace OpenSim.Framework
             }
             return returnstring;
         }
+		
+		static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args)
+        {
+            return SendXmlRpcCommand(url, methodName, args);
+        }
+		
+        static public XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args)
+        {
+			XmlRpcRequest client = new XmlRpcRequest(methodName, args);
+            return client.Send(url, 6000);
+        }
+
     }
 }
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index c29924b..acefe3f 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.GridServer
 		protected BaseHttpServer httpServer;
         protected List<IGridPlugin> m_plugins = new List<IGridPlugin>();
 
-        public BaseHttpServer
+        public BaseHttpServer HttpServer
 		{
 			get { return httpServer; }
 		}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index aa5a432..35f146d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -461,7 +461,7 @@ namespace OpenSim
             {
                 // set proxy url to RegionInfo
                 regionInfo.proxyUrl = proxyUrl;
-                ProxyCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
+                Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
             }
 
             UDPServer udpServer;
@@ -618,7 +618,7 @@ namespace OpenSim
         /// </summary>
         public virtual void Shutdown()
         {
-            ProxyCommand(proxyUrl, "Stop"); 
+            Util.XmlRpcCommand(proxyUrl, "Stop"); 
 
             if (m_startupCommandsFile != String.Empty)
             {
@@ -1200,39 +1200,6 @@ namespace OpenSim
 
         #endregion
 
-        // TODO: remove me!! (almost same as XmlRpcCommand)
-        public object ProxyCommand(string url, string methodName, params object[] args)
-        {
-            if(proxyUrl.Length==0) return null;
-            return SendXmlRpcCommand(url, methodName, args);
-        }
-
-        public object XmlRpcCommand(uint port, string methodName, params object[] args)
-        {
-            return SendXmlRpcCommand("http://localhost:"+port, methodName, args);
-        }
-
-        public object XmlRpcCommand(string url, string methodName, params object[] args)
-        {
-            return SendXmlRpcCommand(url, methodName, args);
-        }
-
-        private object SendXmlRpcCommand(string url, string methodName, object[] args)
-        {
-            try {
-                //MainLog.Instance.Verbose("XMLRPC", "Sending command {0} to {1}", methodName, url);
-                XmlRpcRequest client = new XmlRpcRequest(methodName, args);
-                //MainLog.Instance.Verbose("XMLRPC", client.ToString());
-                XmlRpcResponse response = client.Send(url, 6000);
-                if(!response.IsFault) return response.Value;
-            }
-            catch(Exception e)
-            {
-                m_log.ErrorFormat("XMLRPC Failed to send command {0} to {1}: {2}", methodName, url, e.Message);
-            }
-            return null;
-        }
-
         /// <summary>
         /// Get the start time and up time of Region server
         /// </summary>
-- 
cgit v1.1