Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llmessage/llmail.cpp
View File

@@ -199,13 +199,13 @@ std::string LLMail::buildSMTPTransaction(
{
if(!from_address || !to_address)
{
llinfos << "send_mail build_smtp_transaction reject: missing to and/or"
LL_INFOS() << "send_mail build_smtp_transaction reject: missing to and/or"
<< " from address." << LL_ENDL;
return std::string();
}
if(!valid_subject_chars(subject))
{
llinfos << "send_mail build_smtp_transaction reject: bad subject header: "
LL_INFOS() << "send_mail build_smtp_transaction reject: bad subject header: "
<< "to=<" << to_address
<< ">, from=<" << from_address << ">"
<< LL_ENDL;
@@ -265,7 +265,7 @@ bool LLMail::send(
{
if(!from_address || !to_address)
{
llinfos << "send_mail reject: missing to and/or from address."
LL_INFOS() << "send_mail reject: missing to and/or from address."
<< LL_ENDL;
return false;
}
@@ -303,7 +303,7 @@ bool LLMail::send(
if(!gMailEnabled)
{
llinfos << "send_mail reject: mail system is disabled: to=<"
LL_INFOS() << "send_mail reject: mail system is disabled: to=<"
<< to_address << ">, from=<" << from_address
<< ">" << LL_ENDL;
// Any future interface to SMTP should return this as an
@@ -312,7 +312,7 @@ bool LLMail::send(
}
if(!gSockAddr)
{
llwarns << "send_mail reject: mail system not initialized: to=<"
LL_WARNS() << "send_mail reject: mail system not initialized: to=<"
<< to_address << ">, from=<" << from_address
<< ">" << LL_ENDL;
return false;
@@ -320,7 +320,7 @@ bool LLMail::send(
if(!connect_smtp())
{
llwarns << "send_mail reject: SMTP connect failure: to=<"
LL_WARNS() << "send_mail reject: SMTP connect failure: to=<"
<< to_address << ">, from=<" << from_address
<< ">" << LL_ENDL;
return false;
@@ -338,7 +338,7 @@ bool LLMail::send(
disconnect_smtp();
if(ll_apr_warn_status(status))
{
llwarns << "send_mail socket failure: unable to write "
LL_WARNS() << "send_mail socket failure: unable to write "
<< "to=<" << to_address
<< ">, from=<" << from_address << ">"
<< ", bytes=" << original_size
@@ -347,18 +347,18 @@ bool LLMail::send(
}
if(send_size >= LL_MAX_KNOWN_GOOD_MAIL_SIZE)
{
llwarns << "send_mail message has been shown to fail in testing "
LL_WARNS() << "send_mail message has been shown to fail in testing "
<< "when sending messages larger than " << LL_MAX_KNOWN_GOOD_MAIL_SIZE
<< " bytes. The next log about success is potentially a lie." << LL_ENDL;
}
lldebugs << "send_mail success: "
LL_DEBUGS() << "send_mail success: "
<< "to=<" << to_address
<< ">, from=<" << from_address << ">"
<< ", bytes=" << original_size
<< ", sent=" << send_size << LL_ENDL;
#if LL_LOG_ENTIRE_MAIL_MESSAGE_ON_SEND
llinfos << rfc2822_msg.str() << llendl;
LL_INFOS() << rfc2822_msg.str() << LL_ENDL;
#endif
return true;
}