From 7473ba1260713659924ba18c8f70d67dc672ec2d Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 17 Aug 2022 13:50:01 +0000 Subject: [PATCH] Bug 30684: (follow-up) Use log_warning_msg for the "not running" warning Also, return 0 rather than return 1 in else clause of koha-zebra Sponsored-by: Catalyst IT, New Zealand --- debian/scripts/koha-indexer | 2 +- debian/scripts/koha-plack | 2 +- debian/scripts/koha-sip | 2 +- debian/scripts/koha-worker | 2 +- debian/scripts/koha-z3950-responder | 2 +- debian/scripts/koha-zebra | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/scripts/koha-indexer b/debian/scripts/koha-indexer index 6a44b65b91c..2eb080bd6f1 100755 --- a/debian/scripts/koha-indexer +++ b/debian/scripts/koha-indexer @@ -134,7 +134,7 @@ restart_indexer() log_end_msg 1 fi else - log_daemon_msg "Indexer not running for $name." + log_warning_msg "Indexer not running for $name." start_indexer $name fi } diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack index 1709aac6e0e..3c12d3441c9 100755 --- a/debian/scripts/koha-plack +++ b/debian/scripts/koha-plack @@ -164,7 +164,7 @@ restart_plack() if is_plack_running ${instancename}; then stop_plack $instancename && start_plack $instancename else - log_daemon_msg "Plack not running for ${instancename}." + log_warning_msg "Plack not running for ${instancename}." start_plack $instancename fi } diff --git a/debian/scripts/koha-sip b/debian/scripts/koha-sip index 3fde2a6806c..3372e01d953 100755 --- a/debian/scripts/koha-sip +++ b/debian/scripts/koha-sip @@ -167,7 +167,7 @@ restart_sip() echo $noLF `start_sip ${name}` else if [ "$verbose" != "no" ]; then - log_daemon_msg "Warning: SIP server not running for ${name}." + log_warning_msg "Warning: SIP server not running for ${name}." start_sip ${name} else start_sip ${name} diff --git a/debian/scripts/koha-worker b/debian/scripts/koha-worker index 76863b6a26c..9bb291e9a14 100755 --- a/debian/scripts/koha-worker +++ b/debian/scripts/koha-worker @@ -144,7 +144,7 @@ restart_worker() log_end_msg 1 fi else - log_daemon_msg "Worker not running for $name ($queue)." + log_warning_msg "Worker not running for $name ($queue)." start_worker $name $queue fi } diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder index 56c63d10a6c..ce337df1b81 100755 --- a/debian/scripts/koha-z3950-responder +++ b/debian/scripts/koha-z3950-responder @@ -167,7 +167,7 @@ restart_z3950() log_end_msg 1 fi else - log_daemon_msg "Z39.50/SRU not running for ${instancename}." + log_warning_msg "Z39.50/SRU not running for ${instancename}." start_z3950 $instancename fi } diff --git a/debian/scripts/koha-zebra b/debian/scripts/koha-zebra index b297611c754..cba6955c62d 100755 --- a/debian/scripts/koha-zebra +++ b/debian/scripts/koha-zebra @@ -146,11 +146,11 @@ restart_zebra() echo $noLF `start_zebra ${name}` else if [ "$verbose" != "no" ]; then - log_daemon_msg "Zebra not running for ${name}." + log_warning_msg "Zebra not running for ${name}." start_zebra ${name} else start_zebra ${name} - return 1 + return 0 fi fi } -- 2.20.1