aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs (renamed from OpenSim/Framework/Communications/Services/GridInfoService.cs)32
1 files changed, 5 insertions, 27 deletions
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index cd2a152..d1233dc 100644
--- a/OpenSim/Framework/Communications/Services/GridInfoService.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -34,11 +34,12 @@ using System.Text;
34using log4net; 34using log4net;
35using Nini.Config; 35using Nini.Config;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework;
37using OpenSim.Framework.Servers.HttpServer; 38using OpenSim.Framework.Servers.HttpServer;
38 39
39namespace OpenSim.Framework.Communications.Services 40namespace OpenSim.Server.Handlers.Grid
40{ 41{
41 public class GridInfoService 42 public class GridInfoHandlers
42 { 43 {
43 private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
@@ -55,45 +56,22 @@ namespace OpenSim.Framework.Communications.Services
55 /// anything else requires a general redesign of the config 56 /// anything else requires a general redesign of the config
56 /// system. 57 /// system.
57 /// </remarks> 58 /// </remarks>
58 public GridInfoService(IConfigSource configSource) 59 public GridInfoHandlers(IConfigSource configSource)
59 { 60 {
60 loadGridInfo(configSource); 61 loadGridInfo(configSource);
61 } 62 }
62 63
63 /// <summary>
64 /// Default constructor, uses OpenSim.ini.
65 /// </summary>
66 public GridInfoService()
67 {
68 try
69 {
70 IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini"));
71 loadGridInfo(configSource);
72 }
73 catch (FileNotFoundException)
74 {
75 _log.Warn(
76 "[GRID INFO SERVICE]: No OpenSim.ini file found --- GridInfoServices WILL NOT BE AVAILABLE to your users");
77 }
78 }
79
80 private void loadGridInfo(IConfigSource configSource) 64 private void loadGridInfo(IConfigSource configSource)
81 { 65 {
82 _info["platform"] = "OpenSim"; 66 _info["platform"] = "OpenSim";
83 try 67 try
84 { 68 {
85 IConfig startupCfg = configSource.Configs["Startup"]; 69 IConfig startupCfg = configSource.Configs["Startup"];
86 IConfig gridCfg = configSource.Configs["GridInfo"]; 70 IConfig gridCfg = configSource.Configs["GridInfoService"];
87 IConfig netCfg = configSource.Configs["Network"]; 71 IConfig netCfg = configSource.Configs["Network"];
88 72
89 bool grid = startupCfg.GetBoolean("gridmode", false); 73 bool grid = startupCfg.GetBoolean("gridmode", false);
90 74
91 if (grid)
92 _info["mode"] = "grid";
93 else
94 _info["mode"] = "standalone";
95
96
97 if (null != gridCfg) 75 if (null != gridCfg)
98 { 76 {
99 foreach (string k in gridCfg.GetKeys()) 77 foreach (string k in gridCfg.GetKeys())