Avoid global rspamd_main usage.

diff --git a/src/controller.c b/src/controller.c
index f01b5a566d423dbf00c1f96a50be45a9807d5479..140b0b46b44df7e898d17e3d241a68a3637dc48a 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -67,6 +67,7 @@
 
 #define RSPAMD_PBKDF_ID_V1 1
 
+extern struct rspamd_main *rspamd_main;
 gpointer init_controller_worker (struct rspamd_config *cfg);
 void start_controller_worker (struct rspamd_worker *worker);
 

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 4b9d118dc3b304235bde850258797fbd9badffdb..deb08966f2e15f599ebd83f000277179a0876412 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -49,6 +49,7 @@
 
 #define INVALID_NODE_TIME (guint64) - 1
 
+extern struct rspamd_main *rspamd_main;
 /* Init functions */
 gpointer init_fuzzy (struct rspamd_config *cfg);
 void start_fuzzy (struct rspamd_worker *worker);

diff --git a/src/http_proxy.c b/src/http_proxy.c
index cdd712931daa3877dba26887f10602554be3af3b..12b2373465055b7ee32a5f1696ce5d7ea9e11154 100644 (file)
--- a/src/http_proxy.c
+++ b/src/http_proxy.c
@@ -38,7 +38,7 @@
 
 /* Rotate keys each minute by default */
 #define DEFAULT_ROTATION_TIME 60.0
-
+extern struct rspamd_main *rspamd_main;
 gpointer init_http_proxy (struct rspamd_config *cfg);
 void start_http_proxy (struct rspamd_worker *worker);
 

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 83345a4d505dfe92ac04c058ebdde5dbfd79ce16..404c8f3c7e173d872e3d31c4efee1d6420173b78 100644 (file)
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -384,7 +384,7 @@ append_raw_header (GHashTable *target, struct raw_header *rh)
        else {
                g_hash_table_insert (target, rh->name, rh);
        }
-       debug_task ("add raw header %s: %s", rh->name, rh->value);
+       msg_debug ("add raw header %s: %s", rh->name, rh->value);
 }
 
 /* Convert raw headers to a list of struct raw_header * */

diff --git a/src/libserver/buffer.c b/src/libserver/buffer.c
index 2e41dd94c77a98ad0811f3e4783cc619cdfdded9..f67eacbe0e063871f6bd8c4568fc81a9c1b42c4c 100644 (file)
--- a/src/libserver/buffer.c
+++ b/src/libserver/buffer.c
@@ -31,7 +31,7 @@
 #include "utlist.h"
 
 #define G_DISPATCHER_ERROR dispatcher_error_quark ()
-#define debug_ip(...) rspamd_conditional_debug (rspamd_main->logger, \
+#define debug_ip(...) rspamd_conditional_debug (NULL, \
                NULL, \
                G_STRFUNC, \
                __VA_ARGS__)

diff --git a/src/libserver/html.c b/src/libserver/html.c
index ab4a0c3bb947dd0d90711066d058918cb8ee46ef..5b8be2939d6af3f3c0daf50e266044087c2b98ec 100644 (file)
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -900,7 +900,7 @@ rspamd_html_process_tag (rspamd_mempool_t *pool, struct html_content *hc,
 
                if (tag->flags & FL_CLOSING) {
                        if (!*cur_level) {
-                               debug_task ("bad parent node");
+                               msg_debug ("bad parent node");
                                g_node_destroy (nnode);
                                return FALSE;
                        }
@@ -908,7 +908,7 @@ rspamd_html_process_tag (rspamd_mempool_t *pool, struct html_content *hc,
                        g_node_append (*cur_level, nnode);
 
                        if (!rspamd_html_check_balance (nnode, cur_level)) {
-                               debug_task (
+                               msg_debug (
                                                "mark part as unbalanced as it has not pairable closing tags");
                                hc->flags |= RSPAMD_HTML_FLAG_UNBALANCED;
                                *balanced = FALSE;

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index e7e20eaea8853acd51e836b6119b6aa11e83946d..6e97dbd38188641b158c7b942cdf2ac26c8d4876 100644 (file)
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -962,15 +962,7 @@ rspamd_symbols_cache_check_symbol (struct rspamd_task *task,
                rspamd_session_watch_start (task->s, rspamd_symbols_cache_watcher_cb,
                                item);
 
-               if (item->symbol != NULL &&
-                               G_UNLIKELY (check_debug_symbol (task->cfg, item->symbol))) {
-                       rspamd_log_debug (rspamd_main->logger);
-                       item->func (task, item->user_data);
-                       rspamd_log_nodebug (rspamd_main->logger);
-               }
-               else {
-                       item->func (task, item->user_data);
-               }
+               item->func (task, item->user_data);
 
                t2 = rspamd_get_ticks ();
                diff = (t2 - t1) * 1000000;

diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index 5c2670856c72b453e933a3ede3950d96f0e42583..1cf3484892768259965c54b0bbed0321de6fdf50 100644 (file)
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -777,6 +777,10 @@ rspamd_conditional_debug (rspamd_logger_t *rspamd_log,
        va_list vp;
        u_char *end;
 
+       if (rspamd_log == NULL) {
+               rspamd_log = default_logger;
+       }
+
        if (rspamd_log->cfg->log_level >= G_LOG_LEVEL_DEBUG ||
                rspamd_log->is_debug) {
                if (rspamd_log->debug_ip && addr != NULL) {

diff --git a/src/libutil/logger.h b/src/libutil/logger.h
index 6948f8e04cec7544dbef7219aee884f822ea53c2..8595f548136bfae55b26be60f4e47b5f202e57d7 100644 (file)
--- a/src/libutil/logger.h
+++ b/src/libutil/logger.h
@@ -111,28 +111,6 @@ void rspamd_log_nodebug (rspamd_logger_t *logger);
 /* Typical functions */
 
 /* Logging in postfix style */
-#if defined(RSPAMD_MAIN)
-#define msg_err(...)    rspamd_common_log_function (rspamd_main->logger, \
-               G_LOG_LEVEL_CRITICAL, \
-               G_STRFUNC, \
-               __VA_ARGS__)
-#define msg_warn(...)   rspamd_common_log_function (rspamd_main->logger, \
-               G_LOG_LEVEL_WARNING, \
-               G_STRFUNC, \
-               __VA_ARGS__)
-#define msg_info(...)   rspamd_common_log_function (rspamd_main->logger, \
-               G_LOG_LEVEL_INFO, \
-               G_STRFUNC, \
-               __VA_ARGS__)
-#define msg_debug(...)  rspamd_conditional_debug (rspamd_main->logger, \
-               NULL, \
-               G_STRFUNC, \
-               __VA_ARGS__)
-#define debug_task(...) rspamd_conditional_debug (rspamd_main->logger, \
-               task->from_addr, \
-               G_STRFUNC, \
-               __VA_ARGS__)
-#else
 #define msg_err(...)    rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \
                G_STRFUNC, \
                __VA_ARGS__)
@@ -145,9 +123,8 @@ void rspamd_log_nodebug (rspamd_logger_t *logger);
 #define msg_debug(...)  rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \
                G_STRFUNC, \
                __VA_ARGS__)
-#define debug_task(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \
+#define debug_task(...) rspamd_conditional_debug (NULL, \
+               task->from_addr, \
                G_STRFUNC, \
                __VA_ARGS__)
 #endif
-
-#endif

diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns.c
index a471662e28a6aee334a23efa4d04242c10b2a82f..df16c75ebcc93a62784f8259d3c0086651ac2caa 100644 (file)
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns.c
@@ -214,7 +214,7 @@ lua_dns_resolver_init (lua_State *L)
        cfg = pcfg ? *(pcfg) : NULL;
 
        if (base != NULL && cfg != NULL) {
-               resolver = dns_resolver_init (rspamd_main->logger, base, cfg);
+               resolver = dns_resolver_init (NULL, base, cfg);
                if (resolver) {
                        presolver = lua_newuserdata (L, sizeof (gpointer));
                        rspamd_lua_setclass (L, "rspamd{resolver}", -1);

diff --git a/src/lua/lua_logger.c b/src/lua/lua_logger.c
index dd5d90cc8cc98fdd368e2155a8537b849eaf6717..425d277f9ad639f0be77e5be1d5b23611b3f9e2c 100644 (file)
--- a/src/lua/lua_logger.c
+++ b/src/lua/lua_logger.c
@@ -156,14 +156,14 @@ lua_common_log_line (GLogLevelFlags level, lua_State *L, const gchar *msg)
                rspamd_snprintf (func_buf, sizeof (func_buf), "%s:%d", p,
                        d.currentline);
                if (level == G_LOG_LEVEL_DEBUG) {
-                       rspamd_conditional_debug (rspamd_main->logger,
+                       rspamd_conditional_debug (NULL,
                                NULL,
                                func_buf,
                                "%s",
                                msg);
                }
                else {
-                       rspamd_common_log_function (rspamd_main->logger,
+                       rspamd_common_log_function (NULL,
                                level,
                                func_buf,
                                "%s",
@@ -172,14 +172,14 @@ lua_common_log_line (GLogLevelFlags level, lua_State *L, const gchar *msg)
        }
        else {
                if (level == G_LOG_LEVEL_DEBUG) {
-                       rspamd_conditional_debug (rspamd_main->logger,
+                       rspamd_conditional_debug (NULL,
                                NULL,
                                G_STRFUNC,
                                "%s",
                                msg);
                }
                else {
-                       rspamd_common_log_function (rspamd_main->logger,
+                       rspamd_common_log_function (NULL,
                                level,
                                G_STRFUNC,
                                "%s",

diff --git a/src/lua_worker.c b/src/lua_worker.c
index 6819716612436b1debf844efeacbd2307b076bdf..8e6aaa8fc5c2cdcc0ed53df66caceedebc0f5f48 100644 (file)
--- a/src/lua_worker.c
+++ b/src/lua_worker.c
@@ -42,7 +42,7 @@
 
 /* 60 seconds for worker's IO */
 #define DEFAULT_WORKER_IO_TIMEOUT 60000
-
+extern struct rspamd_main *rspamd_main;
 gpointer init_lua_worker (struct rspamd_config *cfg);
 void start_lua_worker (struct rspamd_worker *worker);
 

diff --git a/src/main.h b/src/main.h
index a4faa1d1628b909aedb9b8c7fac60fdf944f9881..8374af56d32e2b7009850dc569e254cbc98e4671 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -227,10 +227,6 @@ void register_custom_controller_command (const gchar *name,
        controller_func_t handler,
        gboolean privilleged,
        gboolean require_message);
-/**
- * If set, reopen log file on next write
- */
-extern struct rspamd_main *rspamd_main;
 
 #endif
 

diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c
index 7bf5b6db073441a21da01422bd6202a8641da00d..62d6ff6b7743178dece3135555d855da63198a6d 100644 (file)
--- a/src/smtp_proxy.c
+++ b/src/smtp_proxy.c
@@ -43,6 +43,7 @@
 
 #define SMTP_MAXERRORS 15
 
+extern struct rspamd_main *rspamd_main;
 
 /* Init functions */
 gpointer init_smtp_proxy (struct rspamd_config *cfg);

diff --git a/src/worker.c b/src/worker.c
index da9ab77453813fdb62877d075306f5ac6d20d347..a3ed46e0eb50ec119e0485369a0429718d7faec9 100644 (file)
--- a/src/worker.c
+++ b/src/worker.c
@@ -44,6 +44,7 @@
 
 /* 60 seconds for worker's IO */
 #define DEFAULT_WORKER_IO_TIMEOUT 60000
+extern struct rspamd_main *rspamd_main;
 
 gpointer init_worker (struct rspamd_config *cfg);
 void start_worker (struct rspamd_worker *worker);