Merge branch 'master' into unstable

1 files changed, 2 insertions, 2 deletions

diff --git a/heartbeat.cgi b/heartbeat.cgi
index 917853d2b..08cf13fa7 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;
@@ -29,10 +30,9 @@ my $ok = eval {
     die "database not available"            unless $database_ok;
     die "memcached server(s) not available" unless $memcached_ok;
     die "mod_perl/psgi not configured?"     unless BZ_PERSISTENT;
-    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');