A little bit of clean up
parent
b6f6f05e1a
commit
083dd0c17c
|
@ -130,9 +130,7 @@ namespace OpenSim.Services.IntegrationService
|
|||
|
||||
registry = new AddinRegistry(RegistryLocation, ".");
|
||||
|
||||
Ux.suppress_console_output_(true);
|
||||
m_PluginManager = new PluginManager(registry);
|
||||
Ux.suppress_console_output_(false);
|
||||
|
||||
// Deal with files only for now - will add url/environment later
|
||||
m_IntegrationConfigLoc = serverConfig.GetString("IntegrationConfig", String.Empty);
|
||||
|
@ -186,7 +184,7 @@ namespace OpenSim.Services.IntegrationService
|
|||
+ args.Exception.StackTrace);
|
||||
}
|
||||
|
||||
// This is out init
|
||||
// This is our init
|
||||
// We can do build-up and tear-down of our plugin
|
||||
void OnExtensionChanged (object s, ExtensionNodeEventArgs args)
|
||||
{
|
||||
|
@ -217,21 +215,6 @@ namespace OpenSim.Services.IntegrationService
|
|||
m_log.Info ("[INTEGRATION SERVICE]: Plugin Loaded: " + args.AddinId);
|
||||
}
|
||||
|
||||
// private static TextWriter prev_console_;
|
||||
// public void suppress_console_output_(bool save)
|
||||
// {
|
||||
// if (save)
|
||||
// {
|
||||
// prev_console_ = System.Console.Out;
|
||||
// System.Console.SetOut(new StreamWriter(Stream.Null));
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// if (prev_console_ != null)
|
||||
// System.Console.SetOut(prev_console_);
|
||||
// }
|
||||
// }
|
||||
|
||||
private void LoadingPlugin(IntegrationPlugin plugin)
|
||||
{
|
||||
string ConfigPath = String.Format("{0}/(1)", m_IntegrationConfigLoc,plugin.ConfigName);
|
||||
|
|
|
@ -148,21 +148,5 @@ namespace OpenSim.Services.IntegrationService
|
|||
return OpenSim.Server.Base.ServerUtils.LoadPlugin<T>(dllName, args);
|
||||
|
||||
}
|
||||
|
||||
private static TextWriter prev_console_;
|
||||
public static void suppress_console_output_(bool save)
|
||||
{
|
||||
if (save)
|
||||
{
|
||||
prev_console_ = System.Console.Out;
|
||||
System.Console.SetOut(new StreamWriter(Stream.Null));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (prev_console_ != null)
|
||||
System.Console.SetOut(prev_console_);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue