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

Remove all messages from the groups module that would be output when it is 

NOT enabled.
0.6.5-rc1
Melanie Thielker 2009-05-14 21:38:17 +00:00
parent 9248300596
commit 786ff98f6d
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
View File

@ -72,25 +72,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
IConfig groupsConfig = config.Configs["Groups"]; IConfig groupsConfig = config.Configs["Groups"];
m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging");
if (groupsConfig == null) if (groupsConfig == null)
{ {
// Do not run this module by default. // Do not run this module by default.
m_log.Info("[GROUPS-MESSAGING]: No config found in OpenSim.ini -- not enabling XmlRpcGroupsMessaging");
return; return;
} }
else else
{ {
if (!groupsConfig.GetBoolean("Enabled", false)) if (!groupsConfig.GetBoolean("Enabled", false))
{ {
m_log.Info("[GROUPS-MESSAGING]: Groups disabled in configuration");
return; return;
} }
if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
{ {
m_log.Info("[GROUPS-MESSAGING]: Config Groups Module not set to XmlRpcGroups");
m_groupMessagingEnabled = false; m_groupMessagingEnabled = false;
return; return;
@ -100,10 +95,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (!m_groupMessagingEnabled) if (!m_groupMessagingEnabled)
{ {
m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroups Messaging disabled.");
return; return;
} }
m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging");
m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true);
} }

7
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
View File

@ -102,12 +102,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
IConfig groupsConfig = config.Configs["Groups"]; IConfig groupsConfig = config.Configs["Groups"];
m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
if (groupsConfig == null) if (groupsConfig == null)
{ {
// Do not run this module by default. // Do not run this module by default.
m_log.Info("[GROUPS]: No config found in OpenSim.ini -- not enabling XmlRpcGroups");
return; return;
} }
else else
@ -115,18 +112,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_groupsEnabled = groupsConfig.GetBoolean("Enabled", false); m_groupsEnabled = groupsConfig.GetBoolean("Enabled", false);
if (!m_groupsEnabled) if (!m_groupsEnabled)
{ {
m_log.Info("[GROUPS]: Groups disabled in configuration");
return; return;
} }
if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
{ {
m_log.Info("[GROUPS]: Config Groups Module not set to XmlRpcGroups");
m_groupsEnabled = false; m_groupsEnabled = false;
return; return;
} }
m_log.Info("[GROUPS]: Initializing XmlRpcGroups");
string ServiceURL = groupsConfig.GetString("XmlRpcServiceURL", m_defaultXmlRpcServiceURL); string ServiceURL = groupsConfig.GetString("XmlRpcServiceURL", m_defaultXmlRpcServiceURL);
bool DisableKeepAlive = groupsConfig.GetBoolean("XmlRpcDisableKeepAlive", false); bool DisableKeepAlive = groupsConfig.GetBoolean("XmlRpcDisableKeepAlive", false);