diff options
author | Justin Clark-Casey (justincc) | 2011-04-02 02:29:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-02 02:29:42 +0100 |
commit | 4f56c732bc00588cd8ced1be85bc4d13815f86bd (patch) | |
tree | c243d16e6cd085cf45628ea40306a19f83116614 /OpenSim | |
parent | If land is not group owned (group ID is always UUID.Zero) then don't check if... (diff) | |
download | opensim-SC_OLD-4f56c732bc00588cd8ced1be85bc4d13815f86bd.zip opensim-SC_OLD-4f56c732bc00588cd8ced1be85bc4d13815f86bd.tar.gz opensim-SC_OLD-4f56c732bc00588cd8ced1be85bc4d13815f86bd.tar.bz2 opensim-SC_OLD-4f56c732bc00588cd8ced1be85bc4d13815f86bd.tar.xz |
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)
Diffstat (limited to 'OpenSim')
7 files changed, 4 insertions, 36 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 4081888..ec1fb04 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -123,7 +123,7 @@ namespace OpenSim | |||
123 | m_log.Info("===================================================================="); | 123 | m_log.Info("===================================================================="); |
124 | m_log.Info("========================= STARTING OPENSIM ========================="); | 124 | m_log.Info("========================= STARTING OPENSIM ========================="); |
125 | m_log.Info("===================================================================="); | 125 | m_log.Info("===================================================================="); |
126 | m_log.InfoFormat("[OPENSIM MAIN]: Running "); | 126 | |
127 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); | 127 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); |
128 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx | 128 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx |
129 | //GCSettings.LatencyMode = GCLatencyMode.Batch; | 129 | //GCSettings.LatencyMode = GCLatencyMode.Batch; |
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index c0975ea..9255791 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |||
@@ -111,14 +111,12 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
111 | { | 111 | { |
112 | if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) | 112 | if ((SMTPConfig = m_Config.Configs["SMTP"]) == null) |
113 | { | 113 | { |
114 | m_log.InfoFormat("[SMTP] SMTP server not configured"); | ||
115 | m_Enabled = false; | 114 | m_Enabled = false; |
116 | return; | 115 | return; |
117 | } | 116 | } |
118 | 117 | ||
119 | if (!SMTPConfig.GetBoolean("enabled", false)) | 118 | if (!SMTPConfig.GetBoolean("enabled", false)) |
120 | { | 119 | { |
121 | m_log.InfoFormat("[SMTP] module disabled in configuration"); | ||
122 | m_Enabled = false; | 120 | m_Enabled = false; |
123 | return; | 121 | return; |
124 | } | 122 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 2fcc477..0d6313a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -80,16 +80,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
80 | m_config = config.Configs["Concierge"]; | 80 | m_config = config.Configs["Concierge"]; |
81 | 81 | ||
82 | if (null == m_config) | 82 | if (null == m_config) |
83 | { | ||
84 | m_log.Info("[Concierge]: no config found, plugin disabled"); | ||
85 | return; | 83 | return; |
86 | } | ||
87 | 84 | ||
88 | if (!m_config.GetBoolean("enabled", false)) | 85 | if (!m_config.GetBoolean("enabled", false)) |
89 | { | ||
90 | m_log.Info("[Concierge]: plugin disabled by configuration"); | ||
91 | return; | 86 | return; |
92 | } | 87 | |
93 | m_enabled = true; | 88 | m_enabled = true; |
94 | 89 | ||
95 | 90 | ||
@@ -113,9 +108,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
113 | { | 108 | { |
114 | m_replacingChatModule = false; | 109 | m_replacingChatModule = false; |
115 | } | 110 | } |
111 | |||
116 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); | 112 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); |
117 | 113 | ||
118 | |||
119 | // take note of concierge channel and of identity | 114 | // take note of concierge channel and of identity |
120 | m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); | 115 | m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); |
121 | m_whoami = m_config.GetString("whoami", "conferencier"); | 116 | m_whoami = m_config.GetString("whoami", "conferencier"); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 05a1c3b..7909d8a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -106,16 +106,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
106 | m_Config = config.Configs["FreeSwitchVoice"]; | 106 | m_Config = config.Configs["FreeSwitchVoice"]; |
107 | 107 | ||
108 | if (m_Config == null) | 108 | if (m_Config == null) |
109 | { | ||
110 | m_log.Info("[FreeSwitchVoice] no config found, plugin disabled"); | ||
111 | return; | 109 | return; |
112 | } | ||
113 | 110 | ||
114 | if (!m_Config.GetBoolean("Enabled", false)) | 111 | if (!m_Config.GetBoolean("Enabled", false)) |
115 | { | ||
116 | m_log.Info("[FreeSwitchVoice] plugin disabled by configuration"); | ||
117 | return; | 112 | return; |
118 | } | ||
119 | 113 | ||
120 | try | 114 | try |
121 | { | 115 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 34d0e24..534bf92 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -121,16 +121,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
121 | m_config = config.Configs["VivoxVoice"]; | 121 | m_config = config.Configs["VivoxVoice"]; |
122 | 122 | ||
123 | if (null == m_config) | 123 | if (null == m_config) |
124 | { | ||
125 | m_log.Info("[VivoxVoice] no config found, plugin disabled"); | ||
126 | return; | 124 | return; |
127 | } | ||
128 | 125 | ||
129 | if (!m_config.GetBoolean("enabled", false)) | 126 | if (!m_config.GetBoolean("enabled", false)) |
130 | { | ||
131 | m_log.Info("[VivoxVoice] plugin disabled by configuration"); | ||
132 | return; | 127 | return; |
133 | } | ||
134 | 128 | ||
135 | try | 129 | try |
136 | { | 130 | { |
@@ -218,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
218 | m_pluginEnabled = true; | 212 | m_pluginEnabled = true; |
219 | 213 | ||
220 | m_log.Info("[VivoxVoice] plugin enabled"); | 214 | m_log.Info("[VivoxVoice] plugin enabled"); |
221 | |||
222 | } | 215 | } |
223 | catch (Exception e) | 216 | catch (Exception e) |
224 | { | 217 | { |
@@ -228,7 +221,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
228 | } | 221 | } |
229 | } | 222 | } |
230 | 223 | ||
231 | |||
232 | // Called to indicate that the module has been added to the region | 224 | // Called to indicate that the module has been added to the region |
233 | public void AddRegion(Scene scene) | 225 | public void AddRegion(Scene scene) |
234 | { | 226 | { |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 3d34441..8c01d75 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
@@ -86,13 +86,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | 88 | ||
89 | m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule"); | ||
90 | |||
91 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); | 89 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); |
92 | } | 90 | } |
93 | 91 | ||
94 | m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up"); | 92 | m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up"); |
95 | |||
96 | } | 93 | } |
97 | 94 | ||
98 | public void AddRegion(Scene scene) | 95 | public void AddRegion(Scene scene) |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index df60709..74f5208 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
75 | 75 | ||
76 | if (source.Configs["MRM"].GetBoolean("Enabled", false)) | 76 | if (source.Configs["MRM"].GetBoolean("Enabled", false)) |
77 | { | 77 | { |
78 | m_log.Info("[MRM] Enabling MRM Module"); | 78 | m_log.Info("[MRM]: Enabling MRM Module"); |
79 | m_scene = scene; | 79 | m_scene = scene; |
80 | 80 | ||
81 | // when hidden, we don't listen for client initiated script events | 81 | // when hidden, we don't listen for client initiated script events |
@@ -90,14 +90,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
90 | 90 | ||
91 | scene.RegisterModuleInterface<IMRMModule>(this); | 91 | scene.RegisterModuleInterface<IMRMModule>(this); |
92 | } | 92 | } |
93 | else | ||
94 | { | ||
95 | m_log.Info("[MRM] Disabled MRM Module (Disabled in ini)"); | ||
96 | } | ||
97 | } | ||
98 | else | ||
99 | { | ||
100 | m_log.Info("[MRM] Disabled MRM Module (Default disabled)"); | ||
101 | } | 93 | } |
102 | } | 94 | } |
103 | 95 | ||