From b3713de7cefa87af9ed95d091db497cef63502d0 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 29 Aug 2019 13:06:23 +0100 Subject: [Fix] Fix pending checks for events --- src/libstat/backends/redis_backend.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libstat') diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c index 9dd3624fb..fd31d287a 100644 --- a/src/libstat/backends/redis_backend.c +++ b/src/libstat/backends/redis_backend.c @@ -1021,7 +1021,7 @@ rspamd_redis_fin (gpointer data) rt->has_event = FALSE; /* Stop timeout */ - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { ev_timer_stop (rt->task->event_loop, &rt->timeout_event); } @@ -1280,7 +1280,7 @@ rspamd_redis_connected (redisAsyncContext *c, gpointer r, gpointer priv) /* Further is handled by rspamd_redis_processed */ final = FALSE; /* Restart timeout */ - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { rt->timeout_event.repeat = rt->ctx->timeout; ev_timer_again (task->event_loop, &rt->timeout_event); } @@ -1684,7 +1684,7 @@ rspamd_redis_process_tokens (struct rspamd_task *task, rt->has_event = TRUE; rt->tokens = g_ptr_array_ref (tokens); - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { rt->timeout_event.repeat = rt->ctx->timeout; ev_timer_again (task->event_loop, &rt->timeout_event); } @@ -1706,7 +1706,7 @@ rspamd_redis_finalize_process (struct rspamd_task *task, gpointer runtime, struct redis_stat_runtime *rt = REDIS_RUNTIME (runtime); redisAsyncContext *redis; - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { ev_timer_stop (task->event_loop, &rt->timeout_event); } @@ -1889,7 +1889,7 @@ rspamd_redis_learn_tokens (struct rspamd_task *task, GPtrArray *tokens, rt->has_event = TRUE; /* Set timeout */ - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { rt->timeout_event.repeat = rt->ctx->timeout; ev_timer_again (task->event_loop, &rt->timeout_event); } @@ -1917,7 +1917,7 @@ rspamd_redis_finalize_learn (struct rspamd_task *task, gpointer runtime, struct redis_stat_runtime *rt = REDIS_RUNTIME (runtime); redisAsyncContext *redis; - if (ev_is_active (&rt->timeout_event)) { + if (ev_can_stop (&rt->timeout_event)) { ev_timer_stop (task->event_loop, &rt->timeout_event); } -- cgit v1.2.3