|
|
@@ -106,9 +106,9 @@ guint rspamd_logger_add_debug_module (const gchar *mod); |
|
|
|
* Macro to use for faster debug modules |
|
|
|
*/ |
|
|
|
#define INIT_LOG_MODULE(mname) \ |
|
|
|
static guint mname##_log_id = (guint)-1; \ |
|
|
|
static RSPAMD_CONSTRUCTOR(mname##_log_init) { \ |
|
|
|
mname##_log_id = rspamd_logger_add_debug_module(#mname); \ |
|
|
|
static guint rspamd_##mname##_log_id = (guint)-1; \ |
|
|
|
RSPAMD_CONSTRUCTOR(rspamd_##mname##_log_init) { \ |
|
|
|
rspamd_##mname##_log_id = rspamd_logger_add_debug_module(#mname); \ |
|
|
|
} |
|
|
|
|
|
|
|
void rspamd_logger_configure_modules (GHashTable *mods_enabled); |
|
|
@@ -185,6 +185,8 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
|
|
|
|
/* Typical functions */ |
|
|
|
|
|
|
|
extern guint rspamd_task_log_id; |
|
|
|
|
|
|
|
/* Logging in postfix style */ |
|
|
|
#define msg_err(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ |
|
|
|
NULL, NULL, \ |
|
|
@@ -202,9 +204,10 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
NULL, NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define debug_task(...) rspamd_conditional_debug (NULL, \ |
|
|
|
|
|
|
|
#define debug_task(...) rspamd_conditional_debug_fast (NULL, \ |
|
|
|
task->from_addr, \ |
|
|
|
"task", task->task_pool->tag.uid, \ |
|
|
|
rspamd_task_log_id, "task", task->task_pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
|
|
|
@@ -221,8 +224,8 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
task->task_pool->tag.tagname, task->task_pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_debug_task(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ |
|
|
|
"task", task->task_pool->tag.uid, \ |
|
|
|
#define msg_debug_task(...) rspamd_conditional_debug_fast (NULL, task->from_addr, \ |
|
|
|
rspamd_task_log_id, "task", task->task_pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_err_task_encrypted(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL|RSPAMD_LOG_ENCRYPTED, \ |
|
|
@@ -237,10 +240,6 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
task->task_pool->tag.tagname, task->task_pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_debug_task_encrypted(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG|RSPAMD_LOG_ENCRYPTED, \ |
|
|
|
task->task_pool->tag.tagname, task->task_pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
/* Check for NULL pointer first */ |
|
|
|
#define msg_err_task_check(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ |
|
|
|
task ? task->task_pool->tag.tagname : NULL, task ? task->task_pool->tag.uid : NULL, \ |
|
|
@@ -254,8 +253,9 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
task ? task->task_pool->tag.tagname : NULL, task ? task->task_pool->tag.uid : NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_debug_task_check(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ |
|
|
|
task ? task->task_pool->tag.tagname : NULL, task ? task->task_pool->tag.uid : NULL, \ |
|
|
|
#define msg_debug_task_check(...) rspamd_conditional_debug_fast (NULL, \ |
|
|
|
task ? task->from_addr : NULL, \ |
|
|
|
rspamd_task_log_id, "task", task ? task->task_pool->tag.uid : NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
|
|
|
@@ -272,7 +272,7 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
pool->tag.tagname, pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_debug_pool(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ |
|
|
|
#define msg_debug_pool(...) rspamd_conditional_debug (NULL, NULL, \ |
|
|
|
pool->tag.tagname, pool->tag.uid, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
@@ -285,12 +285,13 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger); |
|
|
|
pool ? pool->tag.tagname : NULL, pool ? pool->tag.uid : NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_info_pool_check(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ |
|
|
|
#define msg_info_pool_check(...) rspamd_conditional_debug (NULL, NULL, \ |
|
|
|
G_LOG_LEVEL_INFO, \ |
|
|
|
pool ? pool->tag.tagname : NULL, pool ? pool->tag.uid : NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#define msg_debug_pool_check(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ |
|
|
|
#define msg_debug_pool_check(...) rspamd_conditional_debug (NULL, NULL, \ |
|
|
|
pool ? pool->tag.tagname : NULL, pool ? pool->tag.uid : NULL, \ |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
G_STRFUNC, \ |
|
|
|
__VA_ARGS__) |
|
|
|
#endif |