pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

Backport logging the reason sending email failed to the 2.0 branch.

Browse Source 
Closes #463.
This commit is contained in:
Sadie Powell
2025-01-23 19:22:38 +00:00
parent da7f47c1c7
commit a8eda0676d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mail.h
+1 -1
View File
@@ -26,6 +26,7 @@ namespace Mail
class Message : public Thread
{
private:
Anope::string error;
Anope::string sendmail_path;
Anope::string send_from;
Anope::string mail_to;
@@ -35,7 +36,6 @@ namespace Mail
Anope::string content_type;
bool dont_quote_addresses;
bool success;
public:
/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
* @param sf Config->SendFrom
src/mail.cpp
+7 -5
View File
@@ -22,24 +22,25 @@ Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, con
, message(m)
, content_type(Config->GetBlock("mail")->Get<const Anope::string>("content_type", "text/plain; charset=UTF-8"))
, dont_quote_addresses(Config->GetBlock("mail")->Get<bool>("dontquoteaddresses"))
, success(false)
{
}
Mail::Message::~Message()
{
if (success)
if (error.empty())
Log(LOG_NORMAL, "mail") << "Successfully delivered mail for " << mail_to << " (" << addr << ")";
else
Log(LOG_NORMAL, "mail") << "Error delivering mail for " << mail_to << " (" << addr << ")";
Log(LOG_NORMAL, "mail") << "Error delivering mail for " << mail_to << " (" << addr << "): " << error;
}
void Mail::Message::Run()
{
errno = 0;
FILE *pipe = popen(sendmail_path.c_str(), "w");
if (!pipe)
{
error = strerror(errno);
SetExitState();
return;
}
@@ -56,9 +57,10 @@ void Mail::Message::Run()
fprintf(pipe, "%s", message.c_str());
fprintf(pipe, "\r\n.\r\n");
pclose(pipe);
int result = pclose(pipe);
success = true;
if (result > 0)
error = "Sendmail exited with code " + stringify(result);
SetExitState();
}