commit 0261cb3: [Minor] Fix log objects for C++

[Vsevolod Stakhov]

Author: Vsevolod Stakhov
Date: 2021-10-21 14:55:19 +0100
URL: https://github.com/rspamd/rspamd/commit/0261cb3c5f37b3cb6a6a1c5850b11d29838e4e0e

[Minor] Fix log objects for C++

---
 src/libserver/cfg_file.h    | 11 ++++++-----
 src/libserver/worker_util.h |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index e1bc9cfac..7af4b75a9 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -841,26 +841,27 @@ gboolean rspamd_ip_is_local_cfg (struct rspamd_config *cfg,
 gboolean rspamd_config_libs (struct rspamd_external_libs_ctx *ctx,
 							 struct rspamd_config *cfg);
 
+
 #define msg_err_config(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \
         cfg->cfg_pool->tag.tagname, cfg->checksum, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 #define msg_err_config_forced(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL|RSPAMD_LOG_FORCED, \
         cfg->cfg_pool->tag.tagname, cfg->checksum, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 #define msg_warn_config(...)   rspamd_default_log_function (G_LOG_LEVEL_WARNING, \
         cfg->cfg_pool->tag.tagname, cfg->checksum, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 #define msg_info_config(...)   rspamd_default_log_function (G_LOG_LEVEL_INFO, \
         cfg->cfg_pool->tag.tagname, cfg->checksum, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 extern guint rspamd_config_log_id;
 #define msg_debug_config(...)  rspamd_conditional_debug_fast (NULL, NULL, \
         rspamd_config_log_id, "config", cfg->checksum, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 
 #ifdef  __cplusplus
diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h
index 67d598b88..a67a966ca 100644
--- a/src/libserver/worker_util.h
+++ b/src/libserver/worker_util.h
@@ -292,19 +292,19 @@ gboolean rspamd_worker_hyperscan_ready (struct rspamd_main *rspamd_main,
 
 #define msg_err_main(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \
         rspamd_main->server_pool->tag.tagname, rspamd_main->server_pool->tag.uid, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 #define msg_warn_main(...)   rspamd_default_log_function (G_LOG_LEVEL_WARNING, \
         rspamd_main->server_pool->tag.tagname, rspamd_main->server_pool->tag.uid, \
-        G_STRFUNC, \
+        RSPAMD_LOG_FUNC, \
         __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, \
+        RSPAMD_LOG_FUNC, \
         __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, \
+        RSPAMD_LOG_FUNC, \
         __VA_ARGS__)
 
 #ifdef  __cplusplus