@@ -1,3 +1,7 @@ +2008-06-11 + + * Fix -k to work with -d. (reported by Gary Zhu) + 2008-03-02 [Version 1.2.5-rc1 released] * Add per-item-class tracking of evictions and OOM errors (dormando) ChangeLog @@ -3004,6 +3004,17 @@ int main (int argc, char **argv) { } } + /* daemonize if requested */ + /* if we want to ensure our ability to dump core, don't chdir to / */ + if (daemonize) { + int res; + res = daemon(maxcore, settings.verbose); + if (res == -1) { + fprintf(stderr, "failed to daemon() in order to daemonize\n"); + return 1; + } + } + /* lock paged memory if needed */ if (lock_memory) { #ifdef HAVE_MLOCKALL @@ -3033,18 +3044,6 @@ int main (int argc, char **argv) { } } - /* daemonize if requested */ - /* if we want to ensure our ability to dump core, don't chdir to / */ - if (daemonize) { - int res; - res = daemon(maxcore, settings.verbose); - if (res == -1) { - fprintf(stderr, "failed to daemon() in order to daemonize\n"); - return 1; - } - } - - /* initialize main thread libevent instance */ main_base = event_init(); memcached.c 031fab415ce7efbad450e4c3c0809f2df6313400 dormando dormando@b0b603af-a30f-0410-a34e-baf09ae79d0b http://github.com/tmaesaka/memcached/commit/7391190f7ff652e662a490d4ca0409dc33fba283 7391190f7ff652e662a490d4ca0409dc33fba283 2008-06-11T20:36:09-07:00 2008-06-11T20:36:09-07:00 make -k work under daemon mode (-d). git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@783 b0b603af-a30f-0410-a34e-baf09ae79d0b 8b3a1cfb5704429af1817404a3af2783b9e78544 dormando dormando@b0b603af-a30f-0410-a34e-baf09ae79d0b