From: Amos Jeffries Date: Thu, 7 Oct 2010 13:07:12 +0000 (+1300) Subject: Author: Alex Rousskov X-Git-Tag: take1~193 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ae5c85f905fae5bc3fce597464c776ede73a765;p=thirdparty%2Fsquid.git Author: Alex Rousskov Bug 3002: store initialization (-z) does not work with SMP configs --- diff --git a/src/main.cc b/src/main.cc index 0865e3c785..111e878dce 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1401,6 +1401,9 @@ SquidMain(int argc, char **argv) /* NOTREACHED */ } + if (!opt_no_daemon && Config.workers > 0) + watch_child(argv); + if (opt_create_swap_dirs) { /* chroot if configured to run inside chroot */ @@ -1419,9 +1422,6 @@ SquidMain(int argc, char **argv) CpuAffinityCheck(); CpuAffinityInit(); - if (!opt_no_daemon && Config.workers > 0) - watch_child(argv); - setMaxFD(); /* init comm module */