From: Andrew Dolgov Date: Wed, 23 Jan 2008 11:43:11 +0000 (+0100) Subject: update_daemon2: fix locking X-Git-Tag: 1.2.20~74 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=884c0a367b17d22d154fdb022c496b3e4ac777a8;p=tt-rss.git update_daemon2: fix locking --- diff --git a/update_daemon2.php b/update_daemon2.php index 53de6b3e..68989c8e 100644 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -32,13 +32,22 @@ pcntl_signal(SIGCHLD, 'sigchld_handler'); pcntl_signal(SIGINT, 'sigint_handler'); - $lock_handle = make_lockfile("update_daemon.lock"); - - if (!$lock_handle) { - die("error: Can't create lockfile ($lock_filename). ". + if (file_is_locked("update_daemon.lock")) { + die("error: Can't create lockfile. ". "Maybe another daemon is already running.\n"); } + if (!pcntl_fork()) { + $lock_handle = make_lockfile("update_daemon.lock"); + + if (!$lock_handle) { + die("error: Can't create lockfile. ". + "Maybe another daemon is already running.\n"); + } + + while (true) { sleep(100); } + } + while (true) { $next_spawn = $last_checkpoint + SPAWN_INTERVAL - time();