diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/logger.c | 6 | ||||
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/protocol.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/logger.c b/src/logger.c index 25839d026..19ea767b8 100644 --- a/src/logger.c +++ b/src/logger.c @@ -485,7 +485,7 @@ file_log_function (const gchar * log_domain, const gchar *function, GLogLevelFla now = time (NULL); tms = localtime (&now); - strftime (timebuf, sizeof (timebuf), "%b %d %H:%M:%S", tms); + strftime (timebuf, sizeof (timebuf), "%F %H:%M:%S", tms); switch (rspamd_log->process_type) { case TYPE_MAIN: cptype = "main"; @@ -510,10 +510,10 @@ file_log_function (const gchar * log_domain, const gchar *function, GLogLevelFla break; } if (function == NULL) { - r = rspamd_snprintf (tmpbuf, sizeof (tmpbuf), "#%P(%s): %s rspamd ", rspamd_log->pid, cptype, timebuf); + r = rspamd_snprintf (tmpbuf, sizeof (tmpbuf), "%s #%P(%s) ", timebuf, rspamd_log->pid, cptype); } else { - r = rspamd_snprintf (tmpbuf, sizeof (tmpbuf), "#%P(%s): %s rspamd %s: ", rspamd_log->pid, cptype, timebuf, function); + r = rspamd_snprintf (tmpbuf, sizeof (tmpbuf), "%s #%P(%s) %s: ", timebuf, rspamd_log->pid, cptype, function); } iov[0].iov_base = tmpbuf; iov[0].iov_len = r; diff --git a/src/message.c b/src/message.c index 834f36f45..f3be3032a 100644 --- a/src/message.c +++ b/src/message.c @@ -767,7 +767,7 @@ process_message (struct worker_task *task) debug_task ("found %d parts in message", task->parts_count); if (task->queue_id == NULL) { - task->queue_id = (char *)g_mime_message_get_message_id (task->message); + task->queue_id = "undef"; } task->message_id = g_mime_message_get_message_id (task->message); if (task->message_id == NULL) { diff --git a/src/protocol.c b/src/protocol.c index 7d26d6c80..f86f25677 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -800,7 +800,7 @@ write_check_reply (struct worker_task *task) cd.task = task; cd.log_buf = logbuf; - cd.log_offset = rspamd_snprintf (logbuf, sizeof (logbuf), "msg ok, id: <%s>, ", task->message_id); + cd.log_offset = rspamd_snprintf (logbuf, sizeof (logbuf), "id: <%s>, qid: <%s>, ", task->message_id, task->queue_id); cd.log_size = sizeof (logbuf); cd.alive = TRUE; @@ -886,7 +886,7 @@ write_process_reply (struct worker_task *task) cd.task = task; cd.log_buf = logbuf; - cd.log_offset = rspamd_snprintf (logbuf, sizeof (logbuf), "msg ok, id: <%s>, ", task->message_id); + cd.log_offset = rspamd_snprintf (logbuf, sizeof (logbuf), "id: <%s>, qid: <%s>, ", task->message_id, task->queue_id); cd.log_size = sizeof (logbuf); cd.alive = TRUE; |