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

Comment out some startup logging lines to make up for the one I added earlier on. 

Most of these are where the region modules are telling us they are disabled.  Convention is only to log when enabled (even that is really noisy)
0.7.1-dev
Justin Clark-Casey (justincc) 2011-04-02 02:29:42 +01:00
parent 7bba0177fe
commit 4f56c732bc
7 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSim.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim
m_log.Info("===================================================================="); m_log.Info("====================================================================");
m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("========================= STARTING OPENSIM =========================");
m_log.Info("===================================================================="); m_log.Info("====================================================================");
m_log.InfoFormat("[OPENSIM MAIN]: Running ");
//m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
// http://msdn.microsoft.com/en-us/library/bb384202.aspx // http://msdn.microsoft.com/en-us/library/bb384202.aspx
//GCSettings.LatencyMode = GCLatencyMode.Batch; //GCSettings.LatencyMode = GCLatencyMode.Batch;

2
OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
View File

@ -111,14 +111,12 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
{ {
if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) if ((SMTPConfig = m_Config.Configs["SMTP"]) == null)
{ {
m_log.InfoFormat("[SMTP] SMTP server not configured");
m_Enabled = false; m_Enabled = false;
return; return;
} }
if (!SMTPConfig.GetBoolean("enabled", false)) if (!SMTPConfig.GetBoolean("enabled", false))
{ {
m_log.InfoFormat("[SMTP] module disabled in configuration");
m_Enabled = false; m_Enabled = false;
return; return;
} }

9
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -80,16 +80,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
m_config = config.Configs["Concierge"]; m_config = config.Configs["Concierge"];
if (null == m_config) if (null == m_config)
{
m_log.Info("[Concierge]: no config found, plugin disabled");
return; return;
}
if (!m_config.GetBoolean("enabled", false)) if (!m_config.GetBoolean("enabled", false))
{
m_log.Info("[Concierge]: plugin disabled by configuration");
return; return;
}
m_enabled = true; m_enabled = true;
@ -113,9 +108,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{ {
m_replacingChatModule = false; m_replacingChatModule = false;
} }
m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing");
// take note of concierge channel and of identity // take note of concierge channel and of identity
m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel);
m_whoami = m_config.GetString("whoami", "conferencier"); m_whoami = m_config.GetString("whoami", "conferencier");

6
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -106,16 +106,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
m_Config = config.Configs["FreeSwitchVoice"]; m_Config = config.Configs["FreeSwitchVoice"];
if (m_Config == null) if (m_Config == null)
{
m_log.Info("[FreeSwitchVoice] no config found, plugin disabled");
return; return;
}
if (!m_Config.GetBoolean("Enabled", false)) if (!m_Config.GetBoolean("Enabled", false))
{
m_log.Info("[FreeSwitchVoice] plugin disabled by configuration");
return; return;
}
try try
{ {

8
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -121,16 +121,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
m_config = config.Configs["VivoxVoice"]; m_config = config.Configs["VivoxVoice"];
if (null == m_config) if (null == m_config)
{
m_log.Info("[VivoxVoice] no config found, plugin disabled");
return; return;
}
if (!m_config.GetBoolean("enabled", false)) if (!m_config.GetBoolean("enabled", false))
{
m_log.Info("[VivoxVoice] plugin disabled by configuration");
return; return;
}
try try
{ {
@ -218,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
m_pluginEnabled = true; m_pluginEnabled = true;
m_log.Info("[VivoxVoice] plugin enabled"); m_log.Info("[VivoxVoice] plugin enabled");
} }
catch (Exception e) catch (Exception e)
{ {
@ -228,7 +221,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
} }
} }
// Called to indicate that the module has been added to the region // Called to indicate that the module has been added to the region
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {

3
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@ -86,13 +86,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
return; return;
} }
m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule");
m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
} }
m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up"); m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up");
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)

10
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
if (source.Configs["MRM"].GetBoolean("Enabled", false)) if (source.Configs["MRM"].GetBoolean("Enabled", false))
{ {
m_log.Info("[MRM] Enabling MRM Module"); m_log.Info("[MRM]: Enabling MRM Module");
m_scene = scene; m_scene = scene;
// when hidden, we don't listen for client initiated script events // when hidden, we don't listen for client initiated script events
@ -90,14 +90,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
scene.RegisterModuleInterface<IMRMModule>(this); scene.RegisterModuleInterface<IMRMModule>(this);
} }
else
{
m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)");
}
}
else
{
m_log.Info("[MRM] Disabled MRM Module (Default disabled)");
} }
} }