From c020213cb55dde3baa396d0f581f65b62fe76ea8 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 7 May 2022 15:31:17 +0100 Subject: [PATCH] [Minor] Replace some of macro uses --- src/controller.c | 14 +++++++------- src/fuzzy_storage.c | 12 ++++++------ src/libmime/mime_parser.c | 2 +- src/libmime/scan_result.c | 2 +- src/libserver/composites/composites.cxx | 8 ++++---- src/libserver/dkim.c | 10 +++++----- src/libserver/maps/map_private.h | 8 ++++---- src/libserver/milter.c | 8 ++++---- src/libserver/monitored.c | 10 +++++----- src/libserver/re_cache.c | 10 +++++----- src/libserver/spf.c | 10 +++++----- src/libserver/ssl_util.c | 2 +- src/libstat/backends/redis_backend.c | 2 +- src/libstat/classifiers/bayes.c | 10 +++------- src/libstat/classifiers/lua_classifier.c | 8 ++++---- src/libutil/expression.c | 4 ++-- src/lua/lua_thread_pool.cxx | 2 +- src/lua/lua_xmlrpc.c | 2 +- src/rspamd_proxy.c | 8 ++++---- src/worker.c | 6 +++--- 20 files changed, 67 insertions(+), 71 deletions(-) diff --git a/src/controller.c b/src/controller.c index 631287f64..43378ec30 100644 --- a/src/controller.c +++ b/src/controller.c @@ -69,32 +69,32 @@ #define msg_err_session(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_session(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_session(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_err_ctx(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ "controller", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_ctx(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "controller", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_ctx(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "controller", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_session(...) rspamd_conditional_debug_fast (NULL, session->from_addr, \ rspamd_controller_log_id, "controller", session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(controller) diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c index 3ed30b179..69b9aab09 100644 --- a/src/fuzzy_storage.c +++ b/src/fuzzy_storage.c @@ -54,27 +54,27 @@ static const gchar *local_db_name = "local"; #define msg_err_fuzzy_update(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ session->name, session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_fuzzy_update(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ session->name, session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_fuzzy_update(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ session->name, session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_err_fuzzy_collection(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "fuzzy_collection", session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_fuzzy_collection(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "fuzzy_collection", session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_fuzzy_collection(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "fuzzy_collection", session->uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) /* Init functions */ diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c index 964b5b30e..50e9f2fa7 100644 --- a/src/libmime/mime_parser.c +++ b/src/libmime/mime_parser.c @@ -40,7 +40,7 @@ static const guint max_key_usages = 10000; #define msg_debug_mime(...) rspamd_conditional_debug_fast (NULL, task->from_addr, \ rspamd_mime_log_id, "mime", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(mime) diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c index e266a7e56..d5c03b2c4 100644 --- a/src/libmime/scan_result.c +++ b/src/libmime/scan_result.c @@ -27,7 +27,7 @@ #define msg_debug_metric(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_metric_log_id, "metric", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(metric) diff --git a/src/libserver/composites/composites.cxx b/src/libserver/composites/composites.cxx index 12af51514..3b5b274a7 100644 --- a/src/libserver/composites/composites.cxx +++ b/src/libserver/composites/composites.cxx @@ -31,20 +31,20 @@ #define msg_err_composites(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "composites", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_composites(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "composites", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_composites(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "composites", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_composites(...) rspamd_conditional_debug_fast (NULL, task->from_addr, \ rspamd_composites_log_id, "composites", task->task_pool->tag.uid, \ - __FUNCTION__, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(composites) diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c index 4bf96b1b6..4d32dd8fd 100644 --- a/src/libserver/dkim.c +++ b/src/libserver/dkim.c @@ -68,23 +68,23 @@ enum rspamd_dkim_param_type { #define msg_err_dkim(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "dkim", ctx->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_dkim(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "dkim", ctx->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_dkim(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "dkim", ctx->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_dkim(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_dkim_log_id, "dkim", ctx->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_dkim_taskless(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_dkim_log_id, "dkim", "", \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(dkim) diff --git a/src/libserver/maps/map_private.h b/src/libserver/maps/map_private.h index 4c0805e3a..74b2ea042 100644 --- a/src/libserver/maps/map_private.h +++ b/src/libserver/maps/map_private.h @@ -32,19 +32,19 @@ typedef void (*rspamd_map_tmp_dtor) (gpointer p); extern guint rspamd_map_log_id; #define msg_err_map(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "map", map->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_map(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "map", map->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_map(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "map", map->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_map(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_map_log_id, "map", map->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) enum fetch_proto { diff --git a/src/libserver/milter.c b/src/libserver/milter.c index 142f50c92..7b6fa78ea 100644 --- a/src/libserver/milter.c +++ b/src/libserver/milter.c @@ -32,19 +32,19 @@ #define msg_err_milter(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ "milter", priv->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_milter(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "milter", priv->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_milter(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "milter", priv->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_milter(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_milter_log_id, "milter", priv->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(milter) diff --git a/src/libserver/monitored.c b/src/libserver/monitored.c index 7743d1d7b..99fe64c49 100644 --- a/src/libserver/monitored.c +++ b/src/libserver/monitored.c @@ -77,23 +77,23 @@ struct rspamd_monitored { #define msg_err_mon(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "monitored", m->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_mon(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "monitored", m->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_mon(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "monitored", m->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_notice_mon(...) rspamd_default_log_function (G_LOG_LEVEL_MESSAGE, \ "monitored", m->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_mon(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_monitored_log_id, "monitored", m->tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(monitored) diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c index 0428cfdc7..00246527e 100644 --- a/src/libserver/re_cache.c +++ b/src/libserver/re_cache.c @@ -52,24 +52,24 @@ #define msg_err_re_cache(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "re_cache", cache->hash, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_re_cache(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "re_cache", cache->hash, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_re_cache(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "re_cache", cache->hash, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_re_task(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_re_cache_log_id, "re_cache", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_re_cache(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_re_cache_log_id, "re_cache", cache->hash, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(re_cache) diff --git a/src/libserver/spf.c b/src/libserver/spf.c index 16a1c2579..29780dce5 100644 --- a/src/libserver/spf.c +++ b/src/libserver/spf.c @@ -100,23 +100,23 @@ struct rspamd_spf_library_ctx *spf_lib_ctx = NULL; #define msg_err_spf(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "spf", rec->task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_spf(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "spf", rec->task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_spf(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "spf", rec->task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_spf(...) rspamd_conditional_debug_fast (NULL, rec->task->from_addr, \ rspamd_spf_log_id, "spf", rec->task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_spf_flatten(...) rspamd_conditional_debug_fast_num_id (NULL, NULL, \ rspamd_spf_log_id, "spf", (flat)->digest, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(spf) diff --git a/src/libserver/ssl_util.c b/src/libserver/ssl_util.c index 0aa859dbf..d82d944b3 100644 --- a/src/libserver/ssl_util.c +++ b/src/libserver/ssl_util.c @@ -70,7 +70,7 @@ struct rspamd_ssl_connection { #define msg_debug_ssl(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_ssl_log_id, "ssl", conn->log_tag, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) static void rspamd_ssl_event_handler (gint fd, short what, gpointer ud); diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c index c58f1e682..6d6dc365c 100644 --- a/src/libstat/backends/redis_backend.c +++ b/src/libstat/backends/redis_backend.c @@ -25,7 +25,7 @@ #define msg_debug_stat_redis(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_stat_redis_log_id, "stat_redis", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(stat_redis) diff --git a/src/libstat/classifiers/bayes.c b/src/libstat/classifiers/bayes.c index bec034cd6..6709bb75a 100644 --- a/src/libstat/classifiers/bayes.c +++ b/src/libstat/classifiers/bayes.c @@ -23,19 +23,15 @@ #define msg_err_bayes(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "bayes", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_bayes(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "bayes", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_bayes(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "bayes", task->task_pool->tag.uid, \ - G_STRFUNC, \ - __VA_ARGS__) -#define msg_debug_bayes(...) rspamd_conditional_debug_fast (NULL, task->from_addr, \ - rspamd_bayes_log_id, "bayes", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE_PUBLIC(bayes) diff --git a/src/libstat/classifiers/lua_classifier.c b/src/libstat/classifiers/lua_classifier.c index 21ecba7a1..41657abc0 100644 --- a/src/libstat/classifiers/lua_classifier.c +++ b/src/libstat/classifiers/lua_classifier.c @@ -29,19 +29,19 @@ static GHashTable *lua_classifiers = NULL; #define msg_err_luacl(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ "luacl", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_luacl(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "luacl", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_luacl(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "luacl", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_luacl(...) rspamd_conditional_debug_fast (NULL, task->from_addr, \ rspamd_luacl_log_id, "luacl", task->task_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(luacl) diff --git a/src/libutil/expression.c b/src/libutil/expression.c index ccbe66195..e6992a2d8 100644 --- a/src/libutil/expression.c +++ b/src/libutil/expression.c @@ -84,13 +84,13 @@ struct rspamd_expr_process_data { #define msg_debug_expression(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_expression_log_id, "expression", e->log_id, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #ifdef DEBUG_EXPRESSIONS #define msg_debug_expression_verbose(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_expression_log_id, "expression", e->log_id, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #else #define msg_debug_expression_verbose(...) do {} while(0) diff --git a/src/lua/lua_thread_pool.cxx b/src/lua/lua_thread_pool.cxx index dc6c15163..b3228d00f 100644 --- a/src/lua/lua_thread_pool.cxx +++ b/src/lua/lua_thread_pool.cxx @@ -24,7 +24,7 @@ #define msg_debug_lua_threads(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_lua_threads_log_id, "lua_threads", NULL, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(lua_threads) diff --git a/src/lua/lua_xmlrpc.c b/src/lua/lua_xmlrpc.c index 67f4dcfbc..ec6656f13 100644 --- a/src/lua/lua_xmlrpc.c +++ b/src/lua/lua_xmlrpc.c @@ -28,7 +28,7 @@ static const struct luaL_reg xmlrpclib_m[] = { #define msg_debug_xmlrpc(...) rspamd_conditional_debug_fast (NULL, NULL, \ rspamd_xmlrpc_log_id, "xmlrpc", "", \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(xmlrpc) diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c index e712b2cba..2354576f7 100644 --- a/src/rspamd_proxy.c +++ b/src/rspamd_proxy.c @@ -55,20 +55,20 @@ #define msg_err_session(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_session(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_session(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ session->pool->tag.tagname, session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_debug_session(...) rspamd_conditional_debug_fast (NULL, session->client_addr, \ rspamd_proxy_log_id, "proxy", session->pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) INIT_LOG_MODULE(proxy) diff --git a/src/worker.c b/src/worker.c index c2d00d9cd..87b63bbdf 100644 --- a/src/worker.c +++ b/src/worker.c @@ -55,15 +55,15 @@ worker_t normal_worker = { #define msg_err_ctx(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ "worker", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_warn_ctx(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ "worker", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) #define msg_info_ctx(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ "worker", ctx->cfg->cfg_pool->tag.uid, \ - G_STRFUNC, \ + RSPAMD_LOG_FUNC, \ __VA_ARGS__) struct rspamd_worker_session { -- 2.39.5