projects / packages / log4cxx.git / blame
| Commit | Line | Data |
|---|---|---|
| d316c1c0 JB |
1 | --- apache-log4cxx-1.0.0/src/main/cpp/smtpappender.cpp.orig 2023-01-01 18:42:12.000000000 +0100 |
| 2 | +++ apache-log4cxx-1.0.0/src/main/cpp/smtpappender.cpp 2023-02-09 20:39:33.462772023 +0100 | |
| 3 | @@ -674,23 +674,23 @@ bool SMTPAppender::checkEntryConditions( | |
| 4 | { | |
| 5 | #if LOG4CXX_HAVE_LIBESMTP | |
| 6 | ||
| 7 | - if ((to.empty() && cc.empty() && bcc.empty()) || from.empty() || smtpHost.empty()) | |
| 8 | + if ((_priv->to.empty() && _priv->cc.empty() && _priv->bcc.empty()) || _priv->from.empty() || _priv->smtpHost.empty()) | |
| 9 | { | |
| 10 | - errorHandler->error(LOG4CXX_STR("Message not configured.")); | |
| 11 | + _priv->errorHandler->error(LOG4CXX_STR("Message not configured.")); | |
| 12 | return false; | |
| 13 | } | |
| 14 | ||
| 15 | - if (evaluator == 0) | |
| 16 | + if (_priv->evaluator == 0) | |
| 17 | { | |
| 18 | - errorHandler->error(LOG4CXX_STR("No TriggeringEventEvaluator is set for appender [") + | |
| 19 | - name + LOG4CXX_STR("].")); | |
| 20 | + _priv->errorHandler->error(LOG4CXX_STR("No TriggeringEventEvaluator is set for appender [") + | |
| 21 | + _priv->name + LOG4CXX_STR("].")); | |
| 22 | return false; | |
| 23 | } | |
| 24 | ||
| 25 | ||
| 26 | - if (layout == 0) | |
| 27 | + if (_priv->layout == 0) | |
| 28 | { | |
| 29 | - errorHandler->error(LOG4CXX_STR("No layout set for appender named [") + name + LOG4CXX_STR("].")); | |
| 30 | + _priv->errorHandler->error(LOG4CXX_STR("No layout set for appender named [") + _priv->name + LOG4CXX_STR("].")); | |
| 31 | return false; | |
| 32 | } | |
| 33 | ||
| 34 | @@ -749,22 +749,22 @@ void SMTPAppender::sendBuffer(Pool& p) | |
| 35 | try | |
| 36 | { | |
| 37 | LogString sbuf; | |
| 38 | - layout->appendHeader(sbuf, p); | |
| 39 | + _priv->layout->appendHeader(sbuf, p); | |
| 40 | ||
| 41 | - int len = cb.length(); | |
| 42 | + int len = _priv->cb.length(); | |
| 43 | ||
| 44 | for (int i = 0; i < len; i++) | |
| 45 | { | |
| 46 | - LoggingEventPtr event = cb.get(); | |
| 47 | - layout->format(sbuf, event, p); | |
| 48 | + LoggingEventPtr event = _priv->cb.get(); | |
| 49 | + _priv->layout->format(sbuf, event, p); | |
| 50 | } | |
| 51 | ||
| 52 | - layout->appendFooter(sbuf, p); | |
| 53 | + _priv->layout->appendFooter(sbuf, p); | |
| 54 | ||
| 55 | - SMTPSession session(smtpHost, smtpPort, smtpUsername, smtpPassword, p); | |
| 56 | + SMTPSession session(_priv->smtpHost, _priv->smtpPort, _priv->smtpUsername, _priv->smtpPassword, p); | |
| 57 | ||
| 58 | - SMTPMessage message(session, from, to, cc, | |
| 59 | - bcc, subject, sbuf, p); | |
| 60 | + SMTPMessage message(session, _priv->from, _priv->to, _priv->cc, | |
| 61 | + _priv->bcc, _priv->subject, sbuf, p); | |
| 62 | ||
| 63 | session.send(p); | |
| 64 | ||
| 65 | --- apache-log4cxx-1.0.0/src/main/cpp/CMakeLists.txt.orig 2023-01-01 18:42:12.000000000 +0100 | |
| 66 | +++ apache-log4cxx-1.0.0/src/main/cpp/CMakeLists.txt 2023-02-09 21:23:28.838494968 +0100 | |
| 67 | @@ -212,6 +212,9 @@ endif() | |
| 68 | if(${ENABLE_FMT_LAYOUT}) | |
| 69 | target_link_libraries(log4cxx PUBLIC fmt::fmt) | |
| 70 | endif() | |
| 71 | +if(HAS_LIBESMTP) | |
| 72 | + target_link_libraries(log4cxx PRIVATE esmtp) | |
| 73 | +endif() | |
| 74 | ||
| 75 | if(LOG4CXX_ABI_CHECK) | |
| 76 | message("Getting dependencies for ABI compatability check...") |