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

Do some work on the plugin registry locations and configuration manager

integration
BlueWall 2012-04-02 17:06:31 -04:00
parent 335d167ead
commit 4c5b3adb96
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/IntegrationService/IntegrationService.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Services.IntegrationService
public IntegrationService(IConfigSource config, IHttpServer server) public IntegrationService(IConfigSource config, IHttpServer server)
: base(config, server) : base(config, server)
{ {
m_log.InfoFormat("[IntegrationService]: Loaded"); m_log.InfoFormat("[INTEGRATION SERVICE]: Loaded");
} }

29
OpenSim/Services/IntegrationService/IntegrationServiceBase.cs
View File

@ -54,6 +54,8 @@ namespace OpenSim.Services.IntegrationService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string m_ConfigName = "IntegrationService";
protected IPresenceService m_PresenceService; protected IPresenceService m_PresenceService;
protected IGridService m_GridService; protected IGridService m_GridService;
protected IHttpServer m_Server; protected IHttpServer m_Server;
@ -62,15 +64,20 @@ namespace OpenSim.Services.IntegrationService
public IntegrationServiceBase(IConfigSource config, IHttpServer server) public IntegrationServiceBase(IConfigSource config, IHttpServer server)
: base(config) : base(config)
{ {
Object[] args = new Object[] { config };
IConfig serverConfig = config.Configs[m_ConfigName];
if (serverConfig == null)
throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
string RegistryLocation = serverConfig.GetString("PluginRegistryLocation",
".");
AddinManager.AddinLoaded += on_addinloaded_; AddinManager.AddinLoaded += on_addinloaded_;
AddinManager.AddinLoadError += on_addinloaderror_;
m_Server = server; m_Server = server;
suppress_console_output_(true); suppress_console_output_(true);
AddinManager.Initialize ("."); AddinManager.Initialize (RegistryLocation);
AddinManager.Registry.Update (); AddinManager.Registry.Update ();
suppress_console_output_(false); suppress_console_output_(false);
@ -78,13 +85,13 @@ namespace OpenSim.Services.IntegrationService
{ {
cmd.Init (config); cmd.Init (config);
server.AddStreamHandler((IRequestHandler)cmd); server.AddStreamHandler((IRequestHandler)cmd);
m_log.InfoFormat("[Integration]: Loading IntegrationService plugin {0}", cmd.Name); m_log.InfoFormat("[INTEGRATION SERVICE]: Loading IntegrationService plugin {0}", cmd.Name);
} }
m_IntegrationServerConfig = config.Configs["IntegrationService"]; m_IntegrationServerConfig = config.Configs["IntegrationService"];
if (m_IntegrationServerConfig == null) if (m_IntegrationServerConfig == null)
{ {
throw new Exception("[IntegrationService]: Missing configuration"); throw new Exception("[INTEGRATION SERVICE]: Missing configuration");
return; return;
} }
@ -92,6 +99,7 @@ namespace OpenSim.Services.IntegrationService
string presenceService = m_IntegrationServerConfig.GetString("PresenceService", String.Empty); string presenceService = m_IntegrationServerConfig.GetString("PresenceService", String.Empty);
Object[] args = new Object[] { config };
if (gridService != string.Empty) if (gridService != string.Empty)
m_GridService = LoadPlugin<IGridService>(gridService, args); m_GridService = LoadPlugin<IGridService>(gridService, args);
if (presenceService != string.Empty) if (presenceService != string.Empty)
@ -99,9 +107,20 @@ namespace OpenSim.Services.IntegrationService
} }
private void on_addinloaderror_(object sender, AddinErrorEventArgs args)
{
if (args.Exception == null)
m_log.Error ("[INTEGRATION SERVICE]: Plugin Error: "
+ args.Message);
else
m_log.Error ("[INTEGRATION SERVICE]: Plugin Error: "
+ args.Exception.Message + "\n"
+ args.Exception.StackTrace);
}
private void on_addinloaded_(object sender, AddinEventArgs args) private void on_addinloaded_(object sender, AddinEventArgs args)
{ {
m_log.Info ("[IntegrationService]: Plugin Loaded: " + args.AddinId); m_log.Info ("[INTEGRATION SERVICE]: Plugin Loaded: " + args.AddinId);
} }
private static TextWriter prev_console_; private static TextWriter prev_console_;