1 files changed, 27 insertions, 20 deletions

diff --git a/heartbeat.cgi b/heartbeat.cgi
index 493674c16..c36c734ae 100755
--- a/heartbeat.cgi
+++ b/heartbeat.cgi
@@ -19,29 +19,36 @@ use Bugzilla::Error;
 use Bugzilla::Update;
 
 my $ok = eval {
-    # Ensure that any Throw*Error calls just use die, rather than trying to return html...
-    Bugzilla->error_mode(ERROR_MODE_DIE);
-    my $memcached    = Bugzilla->memcached;
-    my $dbh          = Bugzilla->dbh;
-    my $database_ok  = $dbh->ping;
-    my $versions     = $memcached->{memcached}->server_versions;
-    my $memcached_ok = keys %$versions;
 
-    die "database not available"            unless $database_ok;
-    die "memcached server(s) not available" unless $memcached_ok;
-    if ($dbh->isa('Bugzilla::DB::Mysql') && Bugzilla->params->{utf8} eq 'utf8mb4') {
-        my $mysql_var = $dbh->selectall_hashref(q{SHOW VARIABLES LIKE 'character_set%'}, 'Variable_name');
-        foreach my $name (qw( character_set_client character_set_connection character_set_database )) {
-            my $value = $mysql_var->{$name}{Value};
-            if ($value ne 'utf8mb4') {
-                die "Expected MySQL variable '$name' to be 'utf8mb4', found '$value'";
-            }
-        }
+# Ensure that any Throw*Error calls just use die, rather than trying to return html...
+  Bugzilla->error_mode(ERROR_MODE_DIE);
+  my $memcached    = Bugzilla->memcached;
+  my $dbh          = Bugzilla->dbh;
+  my $database_ok  = $dbh->ping;
+  my $versions     = $memcached->{memcached}->server_versions;
+  my $memcached_ok = keys %$versions;
+
+  die "database not available"            unless $database_ok;
+  die "memcached server(s) not available" unless $memcached_ok;
+  if ($dbh->isa('Bugzilla::DB::Mysql') && Bugzilla->params->{utf8} eq 'utf8mb4') {
+    my $mysql_var = $dbh->selectall_hashref(q{SHOW VARIABLES LIKE 'character_set%'},
+      'Variable_name');
+    foreach my $name (
+      qw( character_set_client character_set_connection character_set_database ))
+    {
+      my $value = $mysql_var->{$name}{Value};
+      if ($value ne 'utf8mb4') {
+        die "Expected MySQL variable '$name' to be 'utf8mb4', found '$value'";
+      }
     }
-    1;
+  }
+  1;
 };
 FATAL("heartbeat error: $@") if !$ok && $@;
 
 my $cgi = Bugzilla->cgi;
-print $cgi->header(-type => 'text/plain', -status => $ok ? '200 OK' : '500 Internal Server Error');
-print $ok ? "Bugzilla OK\n" : "Bugzilla NOT OK\n";
\ No newline at end of file
+print $cgi->header(
+  -type   => 'text/plain',
+  -status => $ok ? '200 OK' : '500 Internal Server Error'
+);
+print $ok ? "Bugzilla OK\n" : "Bugzilla NOT OK\n";