]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Fix some missing userdata
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 20 Jun 2019 09:28:23 +0000 (10:28 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 22 Jun 2019 09:57:29 +0000 (10:57 +0100)
src/libstat/backends/redis_backend.c
src/libstat/stat_config.c
src/libutil/map.c
src/rspamd.c

index 5d8ccc065b6560d49484cf56b9ec757f40811712..e430e491e0026cde5ca9e336801d4914340c8b99 100644 (file)
@@ -1593,6 +1593,7 @@ rspamd_redis_process_tokens (struct rspamd_task *task,
                        ev_timer_again (task->event_loop, &rt->timeout_event);
                }
                else {
+                       rt->timeout_event.data = rt;
                        ev_timer_init (&rt->timeout_event, rspamd_redis_timeout,
                                        rt->ctx->timeout, 0.);
                        ev_timer_start (task->event_loop, &rt->timeout_event);
@@ -1804,6 +1805,7 @@ rspamd_redis_learn_tokens (struct rspamd_task *task, GPtrArray *tokens,
                        ev_timer_again (task->event_loop, &rt->timeout_event);
                }
                else {
+                       rt->timeout_event.data = rt;
                        ev_timer_init (&rt->timeout_event, rspamd_redis_timeout,
                                        rt->ctx->timeout, 0.);
                        ev_timer_start (task->event_loop, &rt->timeout_event);
index 52c78ba6b0c62243a72861fe942204e57699a39f..bc4c28b5dd52a7d255f76cbbcfd1502a24fb5d26 100644 (file)
@@ -558,6 +558,7 @@ rspamd_stat_ctx_register_async (rspamd_stat_async_handler handler,
                 * First we set timeval to zero as we want cb to be executed as
                 * fast as possible
                 */
+               elt->timer_ev.data = elt;
                ev_timer_init (&elt->timer_ev, rspamd_async_elt_on_timer, 0.0, 0.0);
                ev_timer_start (st_ctx->event_loop, &elt->timer_ev);
        }
index 3d9c84ea76b3742ca315f77b93c0ef08c45cafb0..3ca94806ff8dc37e18bb609fd04db82eede8f182 100644 (file)
@@ -1234,6 +1234,7 @@ rspamd_map_schedule_periodic (struct rspamd_map *map,
        map->scheduled_check = TRUE;
        REF_INIT_RETAIN (cbd, rspamd_map_periodic_dtor);
 
+       cbd->ev.data = cbd;
        ev_timer_init (&cbd->ev, rspamd_map_periodic_callback, jittered_sec, 0.0);
        ev_timer_start (map->event_loop, &cbd->ev);
 
index 813b7b7bb6a7bd83c6a1c53d4bc5d118d0e9d9f0..765b4bd2bc189c06dffa7722ec1407726e6de5b1 100644 (file)
@@ -391,6 +391,7 @@ rspamd_fork_delayed (struct rspamd_worker_conf *cf,
        tv.tv_sec = SOFT_FORK_TIME;
        tv.tv_usec = 0;
        REF_RETAIN (cf);
+       nw->wait_ev.data = nw;
        ev_timer_init (&nw->wait_ev, rspamd_fork_delayed_cb, SOFT_FORK_TIME, 0.0);
        ev_timer_start (rspamd_main->event_loop, &nw->wait_ev);
 }