From c8f5e90ff432d2f3b4db1991c403b8fa9824d284 Mon Sep 17 00:00:00 2001 From: Aliaksey Kandratsenka Date: Sun, 17 Jul 2011 21:27:09 +0300 Subject: handle very early memcached shutdown If memcached shutdown is requested too early this will lead to clock_handler not being set up. So actual shutdown will only happen when some socket event happens which will cause event_hander to be called which will exit event loop. --- daemon/memcached.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/memcached.c b/daemon/memcached.c index d1df8c3..07ea5bd 100644 --- a/daemon/memcached.c +++ b/daemon/memcached.c @@ -7525,8 +7525,10 @@ int main (int argc, char **argv) { /* Drop privileges no longer needed */ drop_privileges(); - /* enter the event loop */ - event_base_loop(main_base, 0); + if (!memcached_shutdown) { + /* enter the event loop */ + event_base_loop(main_base, 0); + } if (settings.verbose) { settings.extensions.logger->log(EXTENSION_LOG_INFO, NULL, -- cgit v1.2.1