Merge branch 'housekeeping' into 'master'
Housekeeping See merge request tt-rss/tt-rss!160
This commit is contained in:
@@ -81,7 +81,10 @@ function ttrss_fatal_handler(): bool {
|
||||
}
|
||||
|
||||
if (class_exists("Logger"))
|
||||
return Logger::log_error((int)$errno, $errstr, $file, (int)$line, $context);
|
||||
Logger::log_error((int)$errno, $errstr, $file, (int)$line, $context);
|
||||
|
||||
if (php_sapi_name() == 'cli')
|
||||
exit(1);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
+2
-2
@@ -202,7 +202,7 @@
|
||||
if (isset($options["feeds"])) {
|
||||
RSSUtils::update_daemon_common(Config::get(Config::DAEMON_FEED_LIMIT), $options);
|
||||
|
||||
if (!isset($options["pidlock"]) || $options["task"] == "0")
|
||||
if (!isset($options["task"]) || $options["task"] == "0")
|
||||
RSSUtils::housekeeping_common();
|
||||
|
||||
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, $options);
|
||||
@@ -249,7 +249,7 @@
|
||||
|
||||
RSSUtils::update_daemon_common(Config::get(Config::DAEMON_FEED_LIMIT), $options);
|
||||
|
||||
if (!isset($options["pidlock"]) || $options["task"] == "0")
|
||||
if (!isset($options["task"]) || $options["task"] == "0")
|
||||
RSSUtils::housekeeping_common();
|
||||
|
||||
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, $options);
|
||||
|
||||
Reference in New Issue
Block a user