]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Revert "one more fr_event_timer fix"
authorAlan T. DeKok <aland@freeradius.org>
Tue, 7 Nov 2017 13:46:40 +0000 (08:46 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 7 Nov 2017 13:46:40 +0000 (08:46 -0500)
This reverts commit 33499ae0ecc1314bbaa679d45e3d29918cf208ae.

one more of let's see if this works

src/lib/io/worker.c

index e8a2b40e3243243c8d9bbb0145c549a2fcbaa5df..12cf8a1cda844a75b28b390e290e15c5e1024fb8 100644 (file)
@@ -667,7 +667,7 @@ static void worker_reset_timer(fr_worker_t *worker)
        fr_time_to_timeval(&when, cleanup);
 
        DEBUG2("Resetting worker cleanup timer to +30s");
-       if (fr_event_timer_insert(NULL, worker->el, &worker->ev_cleanup,
+       if (fr_event_timer_insert(worker, worker->el, &worker->ev_cleanup,
                                  &when, fr_worker_max_request_time, worker) < 0) {
                ERROR("Failed inserting max_request_time timer.");
        }
@@ -1231,8 +1231,6 @@ void fr_worker_destroy(fr_worker_t *worker)
        }
 #endif
 
-       if (worker->ev_cleanup) (void) fr_event_timer_delete(worker->el, &worker->ev_cleanup);
-
        (void) fr_event_pre_delete(worker->el, fr_worker_pre_event, worker);
        (void) fr_event_post_delete(worker->el, fr_worker_post_event, worker);