revert max ui feed title length, tweak truncate_string a bit

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 9d948a64d3c5cdea2e19cea5e1fcfa8d9f04c5ae..81734bc3c6fc7800959380e6099f82812b1addd1 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,9 +9,9 @@
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
-       require_once "config.php";
        require_once "autoload.php";
        require_once "functions.php";
+       require_once "config.php";
        require_once "rssfuncs.php";
 
        // defaults
@@ -218,10 +218,11 @@
                                        register_shutdown_function('task_shutdown');
 
                                        $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+                                       $log = function_exists("flock") && isset($options['log']) ? '--log '.$options['log'] : '';
 
                                        $my_pid = posix_getpid();
 
-                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet --task $j --pidlock $my_pid");
+                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                                        sleep(1);