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

A little bit of clean up

integration
BlueWall 2012-04-20 09:58:24 -04:00
parent b6f6f05e1a
commit 083dd0c17c
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,9 +130,7 @@ namespace OpenSim.Services.IntegrationService
registry = new AddinRegistry(RegistryLocation, "."); registry = new AddinRegistry(RegistryLocation, ".");
Ux.suppress_console_output_(true);
m_PluginManager = new PluginManager(registry); m_PluginManager = new PluginManager(registry);
Ux.suppress_console_output_(false);
// Deal with files only for now - will add url/environment later // Deal with files only for now - will add url/environment later
m_IntegrationConfigLoc = serverConfig.GetString("IntegrationConfig", String.Empty); m_IntegrationConfigLoc = serverConfig.GetString("IntegrationConfig", String.Empty);
@ -186,7 +184,7 @@ namespace OpenSim.Services.IntegrationService
+ args.Exception.StackTrace); + args.Exception.StackTrace);
} }
// This is out init // This is our init
// We can do build-up and tear-down of our plugin // We can do build-up and tear-down of our plugin
void OnExtensionChanged (object s, ExtensionNodeEventArgs args) void OnExtensionChanged (object s, ExtensionNodeEventArgs args)
{ {
@ -217,21 +215,6 @@ namespace OpenSim.Services.IntegrationService
m_log.Info ("[INTEGRATION SERVICE]: Plugin Loaded: " + args.AddinId); 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) private void LoadingPlugin(IntegrationPlugin plugin)
{ {
string ConfigPath = String.Format("{0}/(1)", m_IntegrationConfigLoc,plugin.ConfigName); string ConfigPath = String.Format("{0}/(1)", m_IntegrationConfigLoc,plugin.ConfigName);

16
OpenSim/Services/IntegrationService/IntegrationUtils.cs
View File

@ -148,21 +148,5 @@ namespace OpenSim.Services.IntegrationService
return OpenSim.Server.Base.ServerUtils.LoadPlugin<T>(dllName, args); 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_);
}
}
} }
} }