diff options
author | AliciaRaven | 2016-09-15 18:45:42 +0100 |
---|---|---|
committer | AliciaRaven | 2016-09-15 18:45:42 +0100 |
commit | 733782f2149273fc51c9782aea648cb0f60f4fda (patch) | |
tree | 9c73d519da7757d28c2f77275c4e164e2af32af8 /OpenSim/Region/CoreModules/Scripting | |
parent | Minor, remove unused OSDMap declaration in MySQL profiles (diff) | |
download | opensim-SC_OLD-733782f2149273fc51c9782aea648cb0f60f4fda.zip opensim-SC_OLD-733782f2149273fc51c9782aea648cb0f60f4fda.tar.gz opensim-SC_OLD-733782f2149273fc51c9782aea648cb0f60f4fda.tar.bz2 opensim-SC_OLD-733782f2149273fc51c9782aea648cb0f60f4fda.tar.xz |
Minor. Make email module log message format consistent with other modules
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index 0752ae5..d59cfa9 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
113 | } | 113 | } |
114 | catch (Exception e) | 114 | catch (Exception e) |
115 | { | 115 | { |
116 | m_log.Error("[EMAIL] DefaultEmailModule not configured: " + e.Message); | 116 | m_log.Error("[EMAIL]: DefaultEmailModule not configured: " + e.Message); |
117 | m_Enabled = false; | 117 | m_Enabled = false; |
118 | return; | 118 | return; |
119 | } | 119 | } |
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | m_log.Info("[EMAIL] Activated DefaultEmailModule"); | 145 | m_log.Info("[EMAIL]: Activated DefaultEmailModule"); |
146 | } | 146 | } |
147 | 147 | ||
148 | public void RemoveRegion(Scene scene) | 148 | public void RemoveRegion(Scene scene) |
@@ -268,12 +268,12 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
268 | bool isEMailStrictMatch = EMailreStrict.IsMatch(address); | 268 | bool isEMailStrictMatch = EMailreStrict.IsMatch(address); |
269 | if (!isEMailStrictMatch) | 269 | if (!isEMailStrictMatch) |
270 | { | 270 | { |
271 | m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address); | 271 | m_log.Error("[EMAIL]: REGEX Problem in EMail Address: "+address); |
272 | return; | 272 | return; |
273 | } | 273 | } |
274 | if ((subject.Length + body.Length) > m_MaxEmailSize) | 274 | if ((subject.Length + body.Length) > m_MaxEmailSize) |
275 | { | 275 | { |
276 | m_log.Error("[EMAIL] subject + body larger than limit of " + m_MaxEmailSize + " bytes"); | 276 | m_log.Error("[EMAIL]: subject + body larger than limit of " + m_MaxEmailSize + " bytes"); |
277 | return; | 277 | return; |
278 | } | 278 | } |
279 | 279 | ||
@@ -318,11 +318,11 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
318 | emailMessage.Send(smtpServer); | 318 | emailMessage.Send(smtpServer); |
319 | 319 | ||
320 | //Log | 320 | //Log |
321 | m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.ToString() + "@" + m_HostName); | 321 | m_log.Info("[EMAIL]: EMail sent to: " + address + " from object: " + objectID.ToString() + "@" + m_HostName); |
322 | } | 322 | } |
323 | catch (Exception e) | 323 | catch (Exception e) |
324 | { | 324 | { |
325 | m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message); | 325 | m_log.Error("[EMAIL]: DefaultEmailModule Exception: " + e.Message); |
326 | } | 326 | } |
327 | } | 327 | } |
328 | else | 328 | else |