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

Minor. Make email module log message format consistent with other modules

LSLKeyTest
AliciaRaven 2016-09-15 18:45:42 +01:00
parent f8ac3d9464
commit 733782f214
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[EMAIL] DefaultEmailModule not configured: " + e.Message); m_log.Error("[EMAIL]: DefaultEmailModule not configured: " + e.Message);
m_Enabled = false; m_Enabled = false;
return; return;
} }
@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
} }
} }
m_log.Info("[EMAIL] Activated DefaultEmailModule"); m_log.Info("[EMAIL]: Activated DefaultEmailModule");
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
@ -268,12 +268,12 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
bool isEMailStrictMatch = EMailreStrict.IsMatch(address); bool isEMailStrictMatch = EMailreStrict.IsMatch(address);
if (!isEMailStrictMatch) if (!isEMailStrictMatch)
{ {
m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address); m_log.Error("[EMAIL]: REGEX Problem in EMail Address: "+address);
return; return;
} }
if ((subject.Length + body.Length) > m_MaxEmailSize) if ((subject.Length + body.Length) > m_MaxEmailSize)
{ {
m_log.Error("[EMAIL] subject + body larger than limit of " + m_MaxEmailSize + " bytes"); m_log.Error("[EMAIL]: subject + body larger than limit of " + m_MaxEmailSize + " bytes");
return; return;
} }
@ -318,11 +318,11 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
emailMessage.Send(smtpServer); emailMessage.Send(smtpServer);
//Log //Log
m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.ToString() + "@" + m_HostName); m_log.Info("[EMAIL]: EMail sent to: " + address + " from object: " + objectID.ToString() + "@" + m_HostName);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message); m_log.Error("[EMAIL]: DefaultEmailModule Exception: " + e.Message);
} }
} }
else else