From edbb60ec54e6b8cee986b2aa5bdaaac76e273da5 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 9 Feb 2021 14:42:49 +0000 Subject: [PATCH] [Minor] Log starting sequence --- src/libserver/logger/logger.c | 1 + src/libserver/worker_util.h | 4 ++++ src/rspamd.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/src/libserver/logger/logger.c b/src/libserver/logger/logger.c index cf8ad496f8..21c92bbb9b 100644 --- a/src/libserver/logger/logger.c +++ b/src/libserver/logger/logger.c @@ -150,6 +150,7 @@ rspamd_log_open_emergency (rspamd_mempool_t *pool, gint flags) logger->flags = flags; logger->pool = pool; logger->process_type = "main"; + logger->pid = getpid (); const struct rspamd_logger_funcs *funcs = &console_log_funcs; memcpy (&logger->ops, funcs, sizeof (*funcs)); diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h index 77344ac470..1c1c63dd85 100644 --- a/src/libserver/worker_util.h +++ b/src/libserver/worker_util.h @@ -289,6 +289,10 @@ gboolean rspamd_worker_hyperscan_ready (struct rspamd_main *rspamd_main, rspamd_main->server_pool->tag.tagname, rspamd_main->server_pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) +#define msg_notice_main(...) rspamd_default_log_function (G_LOG_LEVEL_MESSAGE, \ + rspamd_main->server_pool->tag.tagname, rspamd_main->server_pool->tag.uid, \ + G_STRFUNC, \ + __VA_ARGS__) #define msg_info_main(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ rspamd_main->server_pool->tag.tagname, rspamd_main->server_pool->tag.uid, \ G_STRFUNC, \ diff --git a/src/rspamd.c b/src/rspamd.c index cfaba54d6a..e1b69fccd7 100644 --- a/src/rspamd.c +++ b/src/rspamd.c @@ -1410,6 +1410,11 @@ main (gint argc, gchar **argv, gchar **env) detect_priv (rspamd_main); + msg_notice_main ("rspamd " + RVERSION + " is loading configuration, build id: " + RID); + pworker = &workers[0]; while (*pworker) { /* Init string quarks */ -- 2.47.3