French translation update

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 5e4a5ab797b6e9051b39ac739ee5977007ca54ce..c1547fa7f7f00033e0f077686a4b39d506918fd4 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -162,8 +162,9 @@
        if (isset($options["daemon"])) {
                while (true) {
                        $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+         $log = isset($options['log']) ? '--log '.$options['log'] : '';
 
-                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
+                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log");
                        _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
                        sleep(DAEMON_SLEEP_INTERVAL);
                }
@@ -175,7 +176,9 @@
                }
 
                update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
-               housekeeping_common(true);
+
+               if (!isset($options["pidlock"]) || $options["task"] == 0)
+                       housekeeping_common(true);
 
                PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
        }
@@ -344,10 +347,6 @@
 
        PluginHost::getInstance()->run_commands($options);
 
-       if ($lock_handle != false) {
-               fclose($lock_handle);
-       }
-
        if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
                unlink(LOCK_DIRECTORY . "/$lock_filename");
 ?>