projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ceeac0
)
SMTP-Client: streamline logging; make look more uniq
author
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 29 Apr 2012 10:13:34 +0000
(12:13 +0200)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 29 Apr 2012 10:13:34 +0000
(12:13 +0200)
citadel/modules/smtp/serv_smtpeventclient.c
patch
|
blob
|
history
citadel/modules/smtp/serv_smtpqueue.c
patch
|
blob
|
history
citadel/modules/smtp/smtp_clienthandlers.c
patch
|
blob
|
history
citadel/modules/smtp/smtp_clienthandlers.h
patch
|
blob
|
history
diff --git
a/citadel/modules/smtp/serv_smtpeventclient.c
b/citadel/modules/smtp/serv_smtpeventclient.c
index f15a18564a669a43266edb6ae1f4996d4578b47d..d98a2181b084d893814c27bbbe58890a21c7f78e 100644
(file)
--- a/
citadel/modules/smtp/serv_smtpeventclient.c
+++ b/
citadel/modules/smtp/serv_smtpeventclient.c
@@
-96,7
+96,7
@@
void DeleteSmtpOutMsg(void *v)
{
SmtpOutMsg *Msg = v;
AsyncIO *IO = &Msg->IO;
{
SmtpOutMsg *Msg = v;
AsyncIO *IO = &Msg->IO;
- EV
_syslog(LOG_DEBUG, "SMTP: %s Aborting
\n", __FUNCTION__);
+ EV
S_syslog(LOG_DEBUG, "%s Exit
\n", __FUNCTION__);
/* these are kept in our own space and free'd below */
Msg->IO.ConnectMe = NULL;
/* these are kept in our own space and free'd below */
Msg->IO.ConnectMe = NULL;
@@
-148,7
+148,7
@@
inline void FinalizeMessageSend_1(AsyncIO *IO)
Status = "Delivery failed temporarily; will retry later.";
EVS_syslog(LOG_INFO,
Status = "Delivery failed temporarily; will retry later.";
EVS_syslog(LOG_INFO,
- "
SMTP:
%s Time[%fs] Recipient <%s> @ <%s> (%s) Status message: %s\n",
+ "%s Time[%fs] Recipient <%s> @ <%s> (%s) Status message: %s\n",
Status,
Msg->IO.Now - Msg->IO.StartIO,
Msg->user,
Status,
Msg->IO.Now - Msg->IO.StartIO,
Msg->user,
@@
-186,7
+186,7
@@
inline void FinalizeMessageSend_DB_1(AsyncIO *IO)
* Uncompleted delivery instructions remain, so delete the old
* instructions and replace with the updated ones.
*/
* Uncompleted delivery instructions remain, so delete the old
* instructions and replace with the updated ones.
*/
- EVS_syslog(LOG_DEBUG, "
SMTPQD:
%ld", Msg->MyQItem->QueMsgID);
+ EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
}
eNextState FinalizeMessageSend_DB1(AsyncIO *IO)
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &Msg->MyQItem->QueMsgID, 1, "");
}
eNextState FinalizeMessageSend_DB1(AsyncIO *IO)
@@
-228,7
+228,7
@@
inline void FinalizeMessageSend_DB_3(AsyncIO *IO)
msg->cm_fields['U'] = strdup("QMSG");
Msg->MyQItem->QueMsgID =
CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
msg->cm_fields['U'] = strdup("QMSG");
Msg->MyQItem->QueMsgID =
CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- EVS_syslog(LOG_DEBUG, "
SMTPQ:
%ld", Msg->MyQItem->QueMsgID);
+ EVS_syslog(LOG_DEBUG, "%ld", Msg->MyQItem->QueMsgID);
CtdlFreeMessage(msg);
}
else {
CtdlFreeMessage(msg);
}
else {
@@
-290,16
+290,16
@@
eNextState FailOneAttempt(AsyncIO *IO)
Msg->pCurrRelay = Msg->pCurrRelay->Next;
if (Msg->pCurrRelay == NULL) {
Msg->pCurrRelay = Msg->pCurrRelay->Next;
if (Msg->pCurrRelay == NULL) {
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s Aborting\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s Aborting\n", __FUNCTION__);
return eAbort;
}
if (Msg->pCurrRelay->IsIP) {
return eAbort;
}
if (Msg->pCurrRelay->IsIP) {
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s connecting IP\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s connecting IP\n", __FUNCTION__);
return mx_connect_ip(IO);
}
else {
EVS_syslog(LOG_DEBUG,
return mx_connect_ip(IO);
}
else {
EVS_syslog(LOG_DEBUG,
- "
SMTP:
%s resolving next MX Record\n",
+ "%s resolving next MX Record\n",
__FUNCTION__);
return get_one_mx_host_ip(IO);
}
__FUNCTION__);
return get_one_mx_host_ip(IO);
}
@@
-332,9
+332,8
@@
void SetConnectStatus(AsyncIO *IO)
if (Msg->mx_host == NULL)
Msg->mx_host = "<no MX-Record>";
if (Msg->mx_host == NULL)
Msg->mx_host = "<no MX-Record>";
- EVS_syslog(LOG_DEBUG,
- "SMTP client[%ld]: connecting to %s [%s]:%d ...\n",
- Msg->n,
+ EVS_syslog(LOG_INFO,
+ "connecting to %s [%s]:%d ...\n",
Msg->mx_host,
buf,
Msg->IO.ConnectMe->Port);
Msg->mx_host,
buf,
Msg->IO.ConnectMe->Port);
@@
-355,7
+354,7
@@
eNextState mx_connect_ip(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
{
SmtpOutMsg *Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
IO->ConnectMe = Msg->pCurrRelay;
Msg->State = eConnectMX;
IO->ConnectMe = Msg->pCurrRelay;
Msg->State = eConnectMX;
@@
-374,7
+373,7
@@
eNextState get_one_mx_host_ip_done(AsyncIO *IO)
struct hostent *hostent;
QueryCbDone(IO);
struct hostent *hostent;
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s Time[%fs]\n",
+ EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
IO->Now - IO->DNS.Start);
__FUNCTION__,
IO->Now - IO->DNS.Start);
@@
-436,11
+435,10
@@
eNextState get_one_mx_host_ip(AsyncIO *IO)
* - one of the mx'es
*/
* - one of the mx'es
*/
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
EVS_syslog(LOG_DEBUG,
EVS_syslog(LOG_DEBUG,
- "SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
- Msg->n,
+ "looking up %s-Record %s : %d ...\n",
(Msg->pCurrRelay->IPv6)? "aaaa": "a",
Msg->pCurrRelay->Host,
Msg->pCurrRelay->Port);
(Msg->pCurrRelay->IPv6)? "aaaa": "a",
Msg->pCurrRelay->Host,
Msg->pCurrRelay->Port);
@@
-472,9
+470,9
@@
eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
QueryCbDone(IO);
QueryCbDone(IO);
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s Time[%fs]\n",
+ EVS_syslog(LOG_DEBUG, "%s Time[%fs]\n",
__FUNCTION__,
__FUNCTION__,
- IO->Now - IO->DNS.Start);
+
IO->Now - IO->DNS.Start);
pp = &Msg->Relay;
while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
pp = &Msg->Relay;
while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
@@
-552,7
+550,7
@@
eNextState resolve_mx_records(AsyncIO *IO)
{
SmtpOutMsg * Msg = IO->Data;
{
SmtpOutMsg * Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
/* start resolving MX records here. */
if (!QueueQuery(ns_t_mx,
Msg->node,
/* start resolving MX records here. */
if (!QueueQuery(ns_t_mx,
Msg->node,
@@
-616,7
+614,7
@@
void smtp_try_one_queue_entry(OneQueItem *MyQItem,
{
SmtpOutMsg *Msg;
{
SmtpOutMsg *Msg;
-
syslog(LOG_DEBUG, "SMTP:
%s\n", __FUNCTION__);
+
SMTPC_syslog(LOG_DEBUG, "
%s\n", __FUNCTION__);
Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
if (KeepMsgText) Msg->msgtext = MsgText;
Msg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
if (KeepMsgText) Msg->msgtext = MsgText;
@@
-630,10
+628,10
@@
void smtp_try_one_queue_entry(OneQueItem *MyQItem,
sizeof(((CitContext *)
Msg->IO.CitContext)->cs_host));
sizeof(((CitContext *)
Msg->IO.CitContext)->cs_host));
-
syslog(LOG_DEBUG, "SMTP
Starting: [%ld] <%s> CC <%d> \n",
- Msg->MyQItem->MessageID,
- ChrPtr(Msg->MyQEntry->Recipient),
- ((CitContext*)Msg->IO.CitContext)->cs_pid);
+
SMTPC_syslog(LOG_DEBUG, "
Starting: [%ld] <%s> CC <%d> \n",
+
Msg->MyQItem->MessageID,
+
ChrPtr(Msg->MyQEntry->Recipient),
+
((CitContext*)Msg->IO.CitContext)->cs_pid);
if (Msg->pCurrRelay == NULL)
QueueEventContext(&Msg->IO,
resolve_mx_records);
if (Msg->pCurrRelay == NULL)
QueueEventContext(&Msg->IO,
resolve_mx_records);
@@
-680,7
+678,7
@@
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
double Timeout = 0.0;
AsyncIO *IO = &Msg->IO;
double Timeout = 0.0;
AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
switch (NextTCPState) {
case eSendFile:
switch (NextTCPState) {
case eSendFile:
@@
-719,7
+717,7
@@
void SMTPSetTimeout(eNextState NextTCPState, SmtpOutMsg *Msg)
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
}
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
@@
-733,7
+731,7
@@
eNextState SMTP_C_DispatchReadDone(AsyncIO *IO)
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
}
eNextState SMTP_C_DispatchWriteDone(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
SmtpOutMsg *Msg = IO->Data;
eNextState rc;
@@
-750,12
+748,12
@@
eNextState SMTP_C_Terminate(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
{
SmtpOutMsg *Msg = IO->Data;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FinalizeMessageSend(Msg);
}
eNextState SMTP_C_TerminateDB(AsyncIO *IO)
{
return FinalizeMessageSend(Msg);
}
eNextState SMTP_C_TerminateDB(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FinalizeMessageSend_DB(IO);
}
eNextState SMTP_C_Timeout(AsyncIO *IO)
return FinalizeMessageSend_DB(IO);
}
eNextState SMTP_C_Timeout(AsyncIO *IO)
@@
-763,7
+761,7
@@
eNextState SMTP_C_Timeout(AsyncIO *IO)
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
if (Msg->State > eRCPT)
return eAbort;
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
if (Msg->State > eRCPT)
return eAbort;
@@
-775,7
+773,7
@@
eNextState SMTP_C_ConnFail(AsyncIO *IO)
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
return FailOneAttempt(IO);
}
StrBufPlain(IO->ErrMsg, CKEY(ReadErrors[Msg->State]));
return FailOneAttempt(IO);
}
@@
-783,12
+781,12
@@
eNextState SMTP_C_DNSFail(AsyncIO *IO)
{
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
{
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 4;
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
return FailOneAttempt(IO);
}
eNextState SMTP_C_Shutdown(AsyncIO *IO)
{
- EVS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 3;
SmtpOutMsg *Msg = IO->Data;
Msg->MyQEntry->Status = 3;
diff --git
a/citadel/modules/smtp/serv_smtpqueue.c
b/citadel/modules/smtp/serv_smtpqueue.c
index 92bc9d625d0826398c0dab5636f7395f3cfa37d8..a3626c8a7323b19ac558714284fca4c345737222 100644
(file)
--- a/
citadel/modules/smtp/serv_smtpqueue.c
+++ b/
citadel/modules/smtp/serv_smtpqueue.c
@@
-86,6
+86,7
@@
#include "ctdl_module.h"
#include "smtpqueue.h"
#include "ctdl_module.h"
#include "smtpqueue.h"
+#include "smtp_clienthandlers.h"
#include "event_client.h"
#include "event_client.h"
@@
-926,6
+927,7
@@
void smtp_do_procmsg(long msgnum, void *userdata) {
ChrPtr(ThisItem->Recipient),
i,
m);
ChrPtr(ThisItem->Recipient),
i,
m);
+ (*((int*) userdata)) ++;
smtp_try_one_queue_entry(MyQItem,
ThisItem,
Msg,
smtp_try_one_queue_entry(MyQItem,
ThisItem,
Msg,
@@
-997,16
+999,17
@@
void smtp_do_procmsg(long msgnum, void *userdata) {
void smtp_do_queue(void) {
static int is_running = 0;
int num_processed = 0;
void smtp_do_queue(void) {
static int is_running = 0;
int num_processed = 0;
+ int num_activated = 0;
if (is_running)
return; /* Concurrency check - only one can run */
is_running = 1;
pthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
if (is_running)
return; /* Concurrency check - only one can run */
is_running = 1;
pthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
-
syslog(LOG_INFO, "SMTP client:
processing outbound queue");
+
SMTPCM_syslog(LOG_INFO, "
processing outbound queue");
if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
- syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
+
SMTPC_
syslog(LOG_ERR, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
}
else {
num_processed = CtdlForEachMessage(MSGS_ALL,
}
else {
num_processed = CtdlForEachMessage(MSGS_ALL,
@@
-1015,11
+1018,11
@@
void smtp_do_queue(void) {
SPOOLMIME,
NULL,
smtp_do_procmsg,
SPOOLMIME,
NULL,
smtp_do_procmsg,
-
NULL
);
+
&num_activated
);
}
}
- syslog(LOG_INFO,
-
"SMTP client: queue run completed; %d messages process
ed",
-
num_process
ed);
+
SMTPC_
syslog(LOG_INFO,
+
"queue run completed; %d messages processed %d activat
ed",
+
num_processed, num_activat
ed);
run_queue_now = 0;
is_running = 0;
run_queue_now = 0;
is_running = 0;
diff --git
a/citadel/modules/smtp/smtp_clienthandlers.c
b/citadel/modules/smtp/smtp_clienthandlers.c
index 0a01805c6dae39dd9430b038d7dbd03977a638ea..c974e822bf7d63b2fc8d019d2964de4012fcfef6 100644
(file)
--- a/
citadel/modules/smtp/smtp_clienthandlers.c
+++ b/
citadel/modules/smtp/smtp_clienthandlers.c
@@
-106,10
+106,10
@@
#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE)
#define SMTP_DBG_SEND() \
#define SMTP_IS_STATE(WHICH_STATE) (ChrPtr(Msg->IO.IOBuf)[0] == WHICH_STATE)
#define SMTP_DBG_SEND() \
- EVS_syslog(LOG_DEBUG, "
SMTP:
> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
+ EVS_syslog(LOG_DEBUG, "> %s\n", ChrPtr(Msg->IO.SendBuf.Buf))
#define SMTP_DBG_READ() \
#define SMTP_DBG_READ() \
- EVS_syslog(LOG_DEBUG, "
SMTP:
< %s\n", ChrPtr(Msg->IO.IOBuf))
+ EVS_syslog(LOG_DEBUG, "< %s\n", ChrPtr(Msg->IO.IOBuf))
/*****************************************************************************/
/*****************************************************************************/
@@
-374,8
+374,7
@@
eNextState SMTPC_read_QUIT_reply(SmtpOutMsg *Msg)
SMTP_DBG_READ();
EVS_syslog(LOG_DEBUG,
SMTP_DBG_READ();
EVS_syslog(LOG_DEBUG,
- "SMTP client[%ld]: delivery to <%s> @ <%s> (%s) succeeded\n",
- Msg->n,
+ "delivery to <%s> @ <%s> (%s) succeeded\n",
Msg->user,
Msg->node,
Msg->name);
Msg->user,
Msg->node,
Msg->name);
@@
-475,7
+474,7
@@
int smtp_resolve_recipients(SmtpOutMsg *Msg)
int lp, rp;
int i;
int lp, rp;
int i;
- EVNCS_syslog(LOG_DEBUG, "
SMTP:
%s\n", __FUNCTION__);
+ EVNCS_syslog(LOG_DEBUG, "%s\n", __FUNCTION__);
if ((Msg==NULL) ||
(Msg->MyQEntry == NULL) ||
if ((Msg==NULL) ||
(Msg->MyQEntry == NULL) ||
@@
-490,9
+489,7
@@
int smtp_resolve_recipients(SmtpOutMsg *Msg)
Msg->name);
EVNCS_syslog(LOG_DEBUG,
Msg->name);
EVNCS_syslog(LOG_DEBUG,
- "SMTP client[%ld]: Attempting delivery to "
- "<%s> @ <%s> (%s)\n",
- Msg->n,
+ "Attempting delivery to <%s> @ <%s> (%s)\n",
Msg->user,
Msg->node,
Msg->name);
Msg->user,
Msg->node,
Msg->name);
diff --git
a/citadel/modules/smtp/smtp_clienthandlers.h
b/citadel/modules/smtp/smtp_clienthandlers.h
index 46532c03286a698c14b1239438e4a4a4f9234b19..149c3ddc54fbc6bceff972ea636bdfc33d0be5cc 100644
(file)
--- a/
citadel/modules/smtp/smtp_clienthandlers.h
+++ b/
citadel/modules/smtp/smtp_clienthandlers.h
@@
-97,18
+97,27
@@
int smtp_resolve_recipients(SmtpOutMsg *SendMsg);
#define EVS_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, \
#define EVS_syslog(LEVEL, FORMAT, ...) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "
IO[%ld]CC[%d]S[%ld][%ld]
" FORMAT, \
+ "
SMTPC:IO[%ld]CC[%d]S[%ld][%ld]
" FORMAT, \
IO->ID, CCID, QID, N, __VA_ARGS__)
#define EVSM_syslog(LEVEL, FORMAT) \
DBGLOG(LEVEL) syslog(LEVEL, \
IO->ID, CCID, QID, N, __VA_ARGS__)
#define EVSM_syslog(LEVEL, FORMAT) \
DBGLOG(LEVEL) syslog(LEVEL, \
- "
IO[%ld]CC[%d]S[%ld][%ld]
" FORMAT, \
+ "
SMTPC:IO[%ld]CC[%d]S[%ld][%ld]
" FORMAT, \
IO->ID, CCID, QID, N)
#define EVNCS_syslog(LEVEL, FORMAT, ...) \
IO->ID, CCID, QID, N)
#define EVNCS_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "
IO[%ld]S[%ld][%ld]
" FORMAT, \
+ DBGLOG(LEVEL) syslog(LEVEL, "
SMTPC:IO[%ld]S[%ld][%ld]
" FORMAT, \
IO->ID, QID, N, __VA_ARGS__)
#define EVNCSM_syslog(LEVEL, FORMAT) \
IO->ID, QID, N, __VA_ARGS__)
#define EVNCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "
IO[%ld]S[%ld][%ld]
" FORMAT, \
+ DBGLOG(LEVEL) syslog(LEVEL, "
SMTPC:IO[%ld]S[%ld][%ld]
" FORMAT, \
IO->ID, QID, N)
IO->ID, QID, N)
+
+#define SMTPC_syslog(LEVEL, FORMAT, ...) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "SMTPCQ: " FORMAT, \
+ __VA_ARGS__)
+
+#define SMTPCM_syslog(LEVEL, FORMAT) \
+ DBGLOG(LEVEL) syslog(LEVEL, \
+ "SMTPCQ: " FORMAT)