From 6738d7497baeef5c21d4cfa0686bab10b1194815 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 13 Mar 2018 11:08:06 -0400
Subject: Bug 1445042 - log heartbeat errors

---
 heartbeat.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'heartbeat.cgi')

diff --git a/heartbeat.cgi b/heartbeat.cgi
index 40dc8e79b..bb1c9dd46 100755
--- a/heartbeat.cgi
+++ b/heartbeat.cgi
@@ -13,6 +13,7 @@ use warnings;
 use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
+use Bugzilla::Logging;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Update;
@@ -32,7 +33,7 @@ my $ok = eval {
     die "missing bmo feature dependencies"  unless Bugzilla->has_feature('bmo');
     1;
 };
-warn "heartbeat error: $@" if !$ok && $@;
+FATAL("heartbeat error: $@") if !$ok && $@;
 
 my $cgi = Bugzilla->cgi;
 print $cgi->header(-type => 'text/plain', -status => $ok ? '200 OK' : '500 Internal Server Error');
-- 
cgit v1.2.3-24-g4f1b


From 78c733acf22b2e038e1bb3fcdc561caa70ea1fab Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 20 Mar 2018 09:44:34 -0400
Subject: Bug 1447289 - heartbeat check should not check for enabled features

---
 heartbeat.cgi | 1 -
 1 file changed, 1 deletion(-)

(limited to 'heartbeat.cgi')

diff --git a/heartbeat.cgi b/heartbeat.cgi
index bb1c9dd46..0597f1e3a 100755
--- a/heartbeat.cgi
+++ b/heartbeat.cgi
@@ -30,7 +30,6 @@ my $ok = eval {
     die "database not available"            unless $database_ok;
     die "memcached server(s) not available" unless $memcached_ok;
     die "mod_perl not configured?"          unless $ENV{MOD_PERL};
-    die "missing bmo feature dependencies"  unless Bugzilla->has_feature('bmo');
     1;
 };
 FATAL("heartbeat error: $@") if !$ok && $@;
-- 
cgit v1.2.3-24-g4f1b