OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added ModuleName to /OpenSim/StartUp modules + debug messages during startup

afrisby
Tedd Hansen 2008-01-05 16:58:30 +00:00
parent 130dea789a
commit 704e491c3a
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -40,6 +40,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
[Extension("/OpenSim/Startup")] [Extension("/OpenSim/Startup")]
public class LoadRegionsPlugin : IApplicationPlugin public class LoadRegionsPlugin : IApplicationPlugin
{ {
public string ModuleName()
{
return "OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin";
}
public void Initialise(OpenSimMain openSim) public void Initialise(OpenSimMain openSim)
{ {
MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised");

6
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -50,6 +50,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
private BaseHttpServer m_httpd; private BaseHttpServer m_httpd;
private string requiredPassword = ""; private string requiredPassword = "";
public string ModuleName()
{
return "OpenSim.ApplicationPlugins.LoadRegions.RemoteAdminPlugin";
}
public void Initialise(OpenSimMain openSim) public void Initialise(OpenSimMain openSim)
{ {
try try
@ -245,5 +250,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
public void Close() public void Close()
{ {
} }
} }
} }

1
OpenSim/Region/Application/IApplicationPlugin.cs
View File

@ -37,5 +37,6 @@ namespace OpenSim
{ {
void Initialise(OpenSimMain openSim); void Initialise(OpenSimMain openSim);
void Close(); void Close();
string ModuleName();
} }
} }

11
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -294,14 +294,12 @@ namespace OpenSim
m_log = CreateLog(); m_log = CreateLog();
MainLog.Instance = m_log; MainLog.Instance = m_log;
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #1");
// Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
// TerrainManager, StorageManager, HTTP Server // TerrainManager, StorageManager, HTTP Server
// This base will call abstract Initialize // This base will call abstract Initialize
base.StartUp(); base.StartUp();
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #2");
// StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false) // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false)
if (m_sandbox) if (m_sandbox)
{ {
@ -340,26 +338,21 @@ namespace OpenSim
m_httpServer.AddStreamHandler(new SimStatusHandler()); m_httpServer.AddStreamHandler(new SimStatusHandler());
} }
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #3");
// Create a ModuleLoader instance // Create a ModuleLoader instance
m_moduleLoader = new ModuleLoader(m_log, m_config); m_moduleLoader = new ModuleLoader(m_log, m_config);
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #4");
ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup"); ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count); MainLog.Instance.Verbose("PLUGINS", "Loading {0} OpenSim application plugins", nodes.Count);
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #5");
int ctedd = 0; int modcount = 0;
foreach (TypeExtensionNode node in nodes) foreach (TypeExtensionNode node in nodes)
{ {
IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance(); IApplicationPlugin plugin = (IApplicationPlugin)node.CreateInstance();
MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin: ", plugin.GetType().AssemblyQualifiedName.ToString()); MainLog.Instance.Debug("PLUGINS", "Loading OpenSim application plugin(" + modcount + "): ", plugin.ModuleName());
plugin.Initialise(this); plugin.Initialise(this);
m_plugins.Add(plugin); m_plugins.Add(plugin);
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #6: " + ++ctedd);
} }
MainLog.Instance.Verbose("STARTUP", "TEDD DEBUG #7");
// Start UDP servers // Start UDP servers
//for (int i = 0; i < m_udpServers.Count; i++) //for (int i = 0; i < m_udpServers.Count; i++)