aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-01-05 16:58:30 +0000
committerTedd Hansen2008-01-05 16:58:30 +0000
commit704e491c3a7a87ed749c7cdf3656baaafc7afdf4 (patch)
treee0e3d23a5b949ab7d2390530cf9e576dd67c0dda
parentAdded some comments + Ahlotta Debugging in startup sequence (diff)
downloadopensim-SC_OLD-704e491c3a7a87ed749c7cdf3656baaafc7afdf4.zip
opensim-SC_OLD-704e491c3a7a87ed749c7cdf3656baaafc7afdf4.tar.gz
opensim-SC_OLD-704e491c3a7a87ed749c7cdf3656baaafc7afdf4.tar.bz2
opensim-SC_OLD-704e491c3a7a87ed749c7cdf3656baaafc7afdf4.tar.xz
Added ModuleName to /OpenSim/StartUp modules + debug messages during startup
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs11
4 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 4c1c1d2..037a84a 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -40,6 +40,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
40 [Extension("/OpenSim/Startup")] 40 [Extension("/OpenSim/Startup")]
41 public class LoadRegionsPlugin : IApplicationPlugin 41 public class LoadRegionsPlugin : IApplicationPlugin
42 { 42 {
43 public string ModuleName()
44 {
45 return "OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin";
46 }
43 public void Initialise(OpenSimMain openSim) 47 public void Initialise(OpenSimMain openSim)
44 { 48 {
45 MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); 49 MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised");
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index b57d3e6..2f655b3 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -50,6 +50,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
50 private BaseHttpServer m_httpd; 50 private BaseHttpServer m_httpd;
51 private string requiredPassword = ""; 51 private string requiredPassword = "";
52 52
53 public string ModuleName()
54 {
55 return "OpenSim.ApplicationPlugins.LoadRegions.RemoteAdminPlugin";
56 }
57
53 public void Initialise(OpenSimMain openSim) 58 public void Initialise(OpenSimMain openSim)
54 { 59 {
55 try 60 try
@@ -245,5 +250,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
245 public void Close() 250 public void Close()
246 { 251 {
247 } 252 }
253
248 } 254 }
249} \ No newline at end of file 255} \ No newline at end of file
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 4f81354..45b0cd0 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -37,5 +37,6 @@ namespace OpenSim
37 { 37 {
38 void Initialise(OpenSimMain openSim); 38 void Initialise(OpenSimMain openSim);
39 void Close(); 39 void Close();
40 string ModuleName();
40 } 41 }
41} \ No newline at end of file 42} \ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index f41ec21..9f6d934 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -294,14 +294,12 @@ namespace OpenSim
294 m_log = CreateLog(); 294 m_log = CreateLog();
295 MainLog.Instance = m_log; 295 MainLog.Instance = m_log;
296 296
297 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #1");
298 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp 297 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
299 // TerrainManager, StorageManager, HTTP Server 298 // TerrainManager, StorageManager, HTTP Server
300 // This base will call abstract Initialize 299 // This base will call abstract Initialize
301 base.StartUp(); 300 base.StartUp();
302 301
303 302
304 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #2");
305 // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false) 303 // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false)
306 if (m_sandbox) 304 if (m_sandbox)
307 { 305 {
@@ -340,26 +338,21 @@ namespace OpenSim
340 m_httpServer.AddStreamHandler(new SimStatusHandler()); 338 m_httpServer.AddStreamHandler(new SimStatusHandler());
341 } 339 }
342 340
343 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #3");
344 // Create a ModuleLoader instance 341 // Create a ModuleLoader instance
345 m_moduleLoader = new ModuleLoader(m_log, m_config); 342 m_moduleLoader = new ModuleLoader(m_log, m_config);
346 343
347 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #4");
348 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup"); 344 ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
349 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count); 345 MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
350 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #5");
351 346
352 int ctedd = 0; 347 int modcount = 0;
353 foreach (TypeExtensionNode node in nodes) 348 foreach (TypeExtensionNode node in nodes)
354 { 349 {
355 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance(); 350 IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
356 MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin: ", plugin.GetType().AssemblyQualifiedName.ToString()); 351 MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin(" + modcount + "): ", plugin.ModuleName());
357 352
358 plugin.Initialise(this); 353 plugin.Initialise(this);
359 m_plugins.Add(plugin); 354 m_plugins.Add(plugin);
360 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #6: " + ++ctedd);
361 } 355 }
362 MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #7");
363 356
364 // Start UDP servers 357 // Start UDP servers
365 //for (int i = 0; i < m_udpServers.Count; i++) 358 //for (int i = 0; i < m_udpServers.Count; i++)