aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs18
-rw-r--r--OpenSim/Grid/GridServer/Main.cs6
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs16
4 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 691ed57..404fbdc 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -52,10 +52,10 @@ namespace OpenSim.Grid.GridServer
52 /// <param name="FileName">The filename to the grid server plugin DLL</param> 52 /// <param name="FileName">The filename to the grid server plugin DLL</param>
53 public void AddPlugin(string FileName) 53 public void AddPlugin(string FileName)
54 { 54 {
55 MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); 55 MainLog.Instance.Verbose("DATA", "Attempting to load " + FileName);
56 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 56 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
57 57
58 MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 58 MainLog.Instance.Verbose("DATA", "Found " + pluginAssembly.GetTypes().Length + " interfaces.");
59 foreach (Type pluginType in pluginAssembly.GetTypes()) 59 foreach (Type pluginType in pluginAssembly.GetTypes())
60 { 60 {
61 if (!pluginType.IsAbstract) 61 if (!pluginType.IsAbstract)
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer
69 (IGridData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 69 (IGridData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise(); 70 plug.Initialise();
71 _plugins.Add(plug.getName(), plug); 71 _plugins.Add(plug.getName(), plug);
72 MainLog.Instance.Verbose("Storage: Added IGridData Interface"); 72 MainLog.Instance.Verbose("DATA", "Added IGridData Interface");
73 } 73 }
74 74
75 typeInterface = null; 75 typeInterface = null;
@@ -83,7 +83,7 @@ namespace OpenSim.Grid.GridServer
83 (ILogData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 83 (ILogData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
84 plug.Initialise(); 84 plug.Initialise();
85 _logplugins.Add(plug.getName(), plug); 85 _logplugins.Add(plug.getName(), plug);
86 MainLog.Instance.Verbose("Storage: Added ILogData Interface"); 86 MainLog.Instance.Verbose("DATA", "Added ILogData Interface");
87 } 87 }
88 88
89 typeInterface = null; 89 typeInterface = null;
@@ -469,7 +469,7 @@ namespace OpenSim.Grid.GridServer
469 { 469 {
470 ymax = (Int32) requestData["ymax"]; 470 ymax = (Int32) requestData["ymax"];
471 } 471 }
472 MainLog.Instance.Verbose("World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); 472 MainLog.Instance.Verbose("MAP", "World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")");
473 473
474 XmlRpcResponse response = new XmlRpcResponse(); 474 XmlRpcResponse response = new XmlRpcResponse();
475 Hashtable responseData = new Hashtable(); 475 Hashtable responseData = new Hashtable();
@@ -507,7 +507,7 @@ namespace OpenSim.Grid.GridServer
507 507
508 simProfileList.Add(simProfileBlock); 508 simProfileList.Add(simProfileBlock);
509 } 509 }
510 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + 510 MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() +
511 " region(s) in range via FastMode"); 511 " region(s) in range via FastMode");
512 } 512 }
513 else 513 else
@@ -542,7 +542,7 @@ namespace OpenSim.Grid.GridServer
542 } 542 }
543 } 543 }
544 } 544 }
545 MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + 545 MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() +
546 " region(s) in range via Standard Mode"); 546 " region(s) in range via Standard Mode");
547 } 547 }
548 548
@@ -708,7 +708,7 @@ namespace OpenSim.Grid.GridServer
708 708
709 try 709 try
710 { 710 {
711 MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); 711 MainLog.Instance.Verbose("DATA", "Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
712 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 712 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
713 { 713 {
714 try 714 try
@@ -734,7 +734,7 @@ namespace OpenSim.Grid.GridServer
734 } 734 }
735 catch (Exception e) 735 catch (Exception e)
736 { 736 {
737 MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + 737 MainLog.Instance.Warn("GRID", "getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " +
738 e.ToString()); 738 e.ToString());
739 } 739 }
740 } 740 }
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 9b1892d..b793cf9 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -106,12 +106,12 @@ namespace OpenSim.Grid.GridServer
106 //Yeah srsly, that's it. 106 //Yeah srsly, that's it.
107 if (setuponly) Environment.Exit(0); 107 if (setuponly) Environment.Exit(0);
108 108
109 m_console.Verbose("Main.cs:Startup() - Connecting to Storage Server"); 109 m_console.Verbose("GRID", "Connecting to Storage Server");
110 m_gridManager = new GridManager(); 110 m_gridManager = new GridManager();
111 m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win 111 m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
112 m_gridManager.config = Cfg; 112 m_gridManager.config = Cfg;
113 113
114 m_console.Verbose("Main.cs:Startup() - Starting HTTP process"); 114 m_console.Verbose("GRID", "Starting HTTP process");
115 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); 115 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort);
116 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 116 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
117 117
@@ -132,7 +132,7 @@ namespace OpenSim.Grid.GridServer
132 132
133 httpServer.Start(); 133 httpServer.Start();
134 134
135 m_console.Verbose("Main.cs:Startup() - Starting sim status checker"); 135 m_console.Verbose("GRID", "Starting sim status checker");
136 136
137 Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates. 137 Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates.
138 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 138 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index c03c4f0..c834690 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -84,14 +84,14 @@ namespace OpenSim.Grid.UserServer
84 { 84 {
85 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 85 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
86 86
87 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); 87 MainLog.Instance.Verbose("REGION", "Establishing data connection");
88 m_userManager = new UserManager(); 88 m_userManager = new UserManager();
89 m_userManager._config = Cfg; 89 m_userManager._config = Cfg;
90 m_userManager.AddPlugin(Cfg.DatabaseProvider); 90 m_userManager.AddPlugin(Cfg.DatabaseProvider);
91 91
92 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); 92 m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
93 93
94 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 94 MainLog.Instance.Verbose("REGION", "Starting HTTP process");
95 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); 95 BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort);
96 96
97 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); 97 httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index ef4b82d..4d1328e 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Grid.UserServer
78 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 78 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
79 79
80 // Destination 80 // Destination
81 MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + 81 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
82 SimInfo.regionLocY); 82 SimInfo.regionLocY);
83 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 83 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
84 response.SimPort = (Int32)SimInfo.serverPort; 84 response.SimPort = (Int32)SimInfo.serverPort;
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer
90 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; 90 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
91 91
92 // Notify the target of an incoming user 92 // Notify the target of an incoming user
93 MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 93 MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
94 94
95 // Prepare notification 95 // Prepare notification
96 Hashtable SimParams = new Hashtable(); 96 Hashtable SimParams = new Hashtable();
@@ -112,7 +112,7 @@ namespace OpenSim.Grid.UserServer
112 theUser.currentAgent.currentRegion = SimInfo.UUID; 112 theUser.currentAgent.currentRegion = SimInfo.UUID;
113 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 113 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
114 114
115 MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); 115 MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI);
116 // Send 116 // Send
117 117
118 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 118 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer
146 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 146 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
147 147
148 // Destination 148 // Destination
149 MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + 149 MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " +
150 SimInfo.regionLocY); 150 SimInfo.regionLocY);
151 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 151 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
152 response.SimPort = (Int32)SimInfo.serverPort; 152 response.SimPort = (Int32)SimInfo.serverPort;
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.UserServer
158 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; 158 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
159 159
160 // Notify the target of an incoming user 160 // Notify the target of an incoming user
161 MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 161 MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
162 162
163 // Update agent with target sim 163 // Update agent with target sim
164 theUser.currentAgent.currentRegion = SimInfo.UUID; 164 theUser.currentAgent.currentRegion = SimInfo.UUID;
@@ -180,7 +180,7 @@ namespace OpenSim.Grid.UserServer
180 ArrayList SendParams = new ArrayList(); 180 ArrayList SendParams = new ArrayList();
181 SendParams.Add(SimParams); 181 SendParams.Add(SimParams);
182 182
183 MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); 183 MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI);
184 // Send 184 // Send
185 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 185 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
186 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 186 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
@@ -188,8 +188,8 @@ namespace OpenSim.Grid.UserServer
188 188
189 catch (Exception e) 189 catch (Exception e)
190 { 190 {
191 MainLog.Instance.Warn("Default region also not available"); 191 MainLog.Instance.Warn("LOGIN", "Default region also not available");
192 MainLog.Instance.Verbose(e.ToString()); 192 MainLog.Instance.Verbose("LOGIN", e.ToString());
193 } 193 }
194 194
195 } 195 }