diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-06 15:39:23 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-06 15:39:23 +0100 |
| commit | 25b0522484e06ca21957abc2fa7f234fe23e8f7d (patch) | |
| tree | 805c0bb4d4e99197b68db6edc37e15732b944cdc /src/libutil/logger.h | |
| parent | 2a5e10cd472278a35dc4a7980a8130bcb9ca6430 (diff) | |
| download | rspamd-25b0522484e06ca21957abc2fa7f234fe23e8f7d.tar.gz rspamd-25b0522484e06ca21957abc2fa7f234fe23e8f7d.zip | |
Avoid global rspamd_main usage.
Diffstat (limited to 'src/libutil/logger.h')
| -rw-r--r-- | src/libutil/logger.h | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/libutil/logger.h b/src/libutil/logger.h index 6948f8e04..8595f5481 100644 --- 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 |