From 49618dc102c42b7125303511d826f76f0ebaab4c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 19:19:34 -0800
Subject: Moved GridInfo service from where it was to Handlers/Grid
---
OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 154 +++++++++++++++++++++
.../Handlers/Grid/GridInfoServerInConnector.cs | 55 ++++++++
2 files changed, 209 insertions(+)
create mode 100644 OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
create mode 100644 OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
(limited to 'OpenSim/Server')
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
new file mode 100644
index 0000000..d1233dc
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+ public class GridInfoHandlers
+ {
+ private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private Hashtable _info = new Hashtable();
+
+ /// <summary>
+ /// Instantiate a GridInfoService object.
+ /// </summary>
+ /// <param name="configPath">path to config path containing
+ /// grid information</param>
+ /// <remarks>
+ /// GridInfoService uses the [GridInfo] section of the
+ /// standard OpenSim.ini file --- which is not optimal, but
+ /// anything else requires a general redesign of the config
+ /// system.
+ /// </remarks>
+ public GridInfoHandlers(IConfigSource configSource)
+ {
+ loadGridInfo(configSource);
+ }
+
+ private void loadGridInfo(IConfigSource configSource)
+ {
+ _info["platform"] = "OpenSim";
+ try
+ {
+ IConfig startupCfg = configSource.Configs["Startup"];
+ IConfig gridCfg = configSource.Configs["GridInfoService"];
+ IConfig netCfg = configSource.Configs["Network"];
+
+ bool grid = startupCfg.GetBoolean("gridmode", false);
+
+ if (null != gridCfg)
+ {
+ foreach (string k in gridCfg.GetKeys())
+ {
+ _info[k] = gridCfg.GetString(k);
+ }
+ }
+ else if (null != netCfg)
+ {
+ if (grid)
+ _info["login"]
+ = netCfg.GetString(
+ "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
+ else
+ _info["login"]
+ = String.Format(
+ "http://127.0.0.1:{0}/",
+ netCfg.GetString(
+ "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
+
+ IssueWarning();
+ }
+ else
+ {
+ _info["login"] = "http://127.0.0.1:9000/";
+ IssueWarning();
+ }
+ }
+ catch (Exception)
+ {
+ _log.Debug("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults");
+ }
+
+ _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count);
+
+ }
+
+ private void IssueWarning()
+ {
+ _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your OpenSim.ini");
+ _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:");
+
+ foreach (string k in _info.Keys)
+ {
+ _log.WarnFormat("[GRID INFO SERVICE]: {0}: {1}", k, _info[k]);
+ }
+ }
+
+ public XmlRpcResponse XmlRpcGridInfoMethod(XmlRpcRequest request, IPEndPoint remoteClient)
+ {
+ XmlRpcResponse response = new XmlRpcResponse();
+ Hashtable responseData = new Hashtable();
+
+ _log.Info("[GRID INFO SERVICE]: Request for grid info");
+
+ foreach (string k in _info.Keys)
+ {
+ responseData[k] = _info[k];
+ }
+ response.Value = responseData;
+
+ return response;
+ }
+
+ public string RestGetGridInfoMethod(string request, string path, string param,
+ OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append("<gridinfo>\n");
+ foreach (string k in _info.Keys)
+ {
+ sb.AppendFormat("<{0}>{1}</{0}>\n", k, _info[k]);
+ }
+ sb.Append("</gridinfo>\n");
+
+ return sb.ToString();
+ }
+ }
+}
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
new file mode 100644
index 0000000..c9e80d9
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+ public class GridInfoServerInConnector : ServiceConnector
+ {
+ private string m_ConfigName = "GridInfoService";
+
+ public GridInfoServerInConnector(IConfigSource config, IHttpServer server, string configName) :
+ base(config, server, configName)
+ {
+ GridInfoHandlers handlers = new GridInfoHandlers(config);
+
+ server.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
+ handlers.RestGetGridInfoMethod));
+ server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
+ }
+
+ }
+}
--
cgit v1.1