diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-28 16:41:05 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-28 16:41:05 +0100 |
| commit | 8f504b454ed81b202487e168bb076ddd3ca0e4db (patch) | |
| tree | 7044b1da7e18bfa087dd51532b866cf602c9d129 /src/libserver/events.c | |
| parent | bb626a7ff706f68b026e3b52b3b4855417ae5338 (diff) | |
| download | rspamd-8f504b454ed81b202487e168bb076ddd3ca0e4db.tar.gz rspamd-8f504b454ed81b202487e168bb076ddd3ca0e4db.zip | |
More logger fixes.
Diffstat (limited to 'src/libserver/events.c')
| -rw-r--r-- | src/libserver/events.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/libserver/events.c b/src/libserver/events.c index 9bf86eb96..a50c122f3 100644 --- a/src/libserver/events.c +++ b/src/libserver/events.c @@ -33,6 +33,23 @@ #define RSPAMD_SESSION_IS_WATCHING(s) ((s)->flags & RSPAMD_SESSION_FLAG_WATCHING) #define RSPAMD_SESSION_IS_DESTROYING(s) ((s)->flags & RSPAMD_SESSION_FLAG_DESTROYING) +#define msg_err_session(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ + session->pool->tag.tagname, session->pool->tag.uid, \ + G_STRFUNC, \ + __VA_ARGS__) +#define msg_warn_session(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ + session->pool->tag.tagname, session->pool->tag.uid, \ + G_STRFUNC, \ + __VA_ARGS__) +#define msg_info_session(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ + session->pool->tag.tagname, session->pool->tag.uid, \ + G_STRFUNC, \ + __VA_ARGS__) +#define msg_debug_session(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ + session->pool->tag.tagname, session->pool->tag.uid, \ + G_STRFUNC, \ + __VA_ARGS__) + struct rspamd_async_watcher { event_watcher_t cb; guint remain; @@ -119,7 +136,7 @@ rspamd_session_add_event (struct rspamd_async_session *session, struct rspamd_async_event *new; if (session == NULL) { - msg_info ("session is NULL"); + msg_info_session ("session is NULL"); return; } @@ -139,7 +156,7 @@ rspamd_session_add_event (struct rspamd_async_session *session, g_hash_table_insert (session->events, new, new); - msg_debug ("added event: %p, pending %d events, subsystem: %s", + msg_debug_session ("added event: %p, pending %d events, subsystem: %s", user_data, g_hash_table_size (session->events), g_quark_to_string (subsystem)); @@ -153,7 +170,7 @@ rspamd_session_remove_event (struct rspamd_async_session *session, struct rspamd_async_event search_ev, *found_ev; if (session == NULL) { - msg_info ("session is NULL"); + msg_info_session ("session is NULL"); return; } @@ -163,7 +180,7 @@ rspamd_session_remove_event (struct rspamd_async_session *session, found_ev = g_hash_table_lookup (session->events, &search_ev); g_assert (found_ev != NULL); - msg_debug ("removed event: %p, subsystem: %s, pending %d events", ud, + msg_debug_session ("removed event: %p, subsystem: %s, pending %d events", ud, g_quark_to_string (found_ev->subsystem), g_hash_table_size (session->events)); /* Remove event */ @@ -205,7 +222,7 @@ gboolean rspamd_session_destroy (struct rspamd_async_session *session) { if (session == NULL) { - msg_info ("session is NULL"); + msg_info_session ("session is NULL"); return FALSE; } |