From d1bfb86f9da6fa222c78439bd4df579bee5402a8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 12:27:47 +0400 Subject: [PATCH 1/2] remove errorhandler from CLI scripts for the time being --- update.php | 1 - update_daemon2.php | 1 - 2 files changed, 2 deletions(-) diff --git a/update.php b/update.php index 1c43cdb94..23e42a052 100755 --- a/update.php +++ b/update.php @@ -13,7 +13,6 @@ require_once "sanity_check.php"; require_once "db.php"; require_once "db-prefs.php"; - require_once "errorhandler.php"; if (!defined('PHP_EXECUTABLE')) define('PHP_EXECUTABLE', '/usr/bin/php'); diff --git a/update_daemon2.php b/update_daemon2.php index 77d05be66..5a033d9bb 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -20,7 +20,6 @@ require_once "config.php"; require_once "db.php"; require_once "db-prefs.php"; - require_once "errorhandler.php"; // defaults define('PURGE_INTERVAL', 3600); // seconds From 0186be6aebc6479fb0164dd76a0f37919f4819fe Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 12:36:27 +0400 Subject: [PATCH 2/2] another take on inclusion of errorhandler in CLI scripts --- update.php | 4 ++++ update_daemon2.php | 2 ++ 2 files changed, 6 insertions(+) diff --git a/update.php b/update.php index 23e42a052..d8b956942 100755 --- a/update.php +++ b/update.php @@ -88,6 +88,10 @@ return; } + if (!isset($options['daemon'])) { + require_once "errorhandler.php"; + } + if (!isset($options['update-schema'])) { $schema_version = get_schema_version($link); diff --git a/update_daemon2.php b/update_daemon2.php index 5a033d9bb..bf6761205 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -256,6 +256,8 @@ if (!init_connection($link)) return; + require_once "errorhandler.php"; + // We disable stamp file, since it is of no use in a multiprocess update. // not really, tho for the time being -fox if (!make_stampfile('update_daemon.stamp')) {