Do not abort when failing to recover MySQL

Fix #311
cpanel · Sep 7, 2023 · d6c9902 · d6c9902
1 parent b5086fe
commit d6c9902
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -3028,8 +3028,9 @@ EOS
 
     use File::Copy ();
 
-    # use Log::Log4perl qw(:easy);
+    # use Log::Log4perl   qw(:easy);
     INIT { Log::Log4perl->import(qw{:easy}); }
+    use Elevate::Notify ();
 
     # use Elevate::Components::Base();
     our @ISA;
@@ -3138,9 +3139,13 @@ EOS
                 INFO("MySQL $mysql_version restored");
             }
             else {
-                FATAL("Failed to restore MySQL $mysql_version: upgrade $id status '$status'");
+                my $msg = "Failed to restore MySQL $mysql_version: upgrade $id status '$status'";
+
+                FATAL($msg);
                 FATAL("$out");
-                die 'Failed to restore MySQL';
+
+                Elevate::Notify::add_final_notification($msg);
+                return;
             }
         }
         else {

diff --git a/lib/Elevate/Components/MySQL.pm b/lib/Elevate/Components/MySQL.pm
@@ -12,8 +12,9 @@ Capture and reinstall MySQL packages.
 
 use cPstrict;
 
-use File::Copy    ();
-use Log::Log4perl qw(:easy);
+use File::Copy      ();
+use Log::Log4perl   qw(:easy);
+use Elevate::Notify ();
 
 use parent qw{Elevate::Components::Base};
 
@@ -130,9 +131,13 @@ sub _reinstall_mysql_packages {
             INFO("MySQL $mysql_version restored");
         }
         else {
-            FATAL("Failed to restore MySQL $mysql_version: upgrade $id status '$status'");
+            my $msg = "Failed to restore MySQL $mysql_version: upgrade $id status '$status'";
+
+            FATAL($msg);
             FATAL("$out");
-            die 'Failed to restore MySQL';
+
+            Elevate::Notify::add_final_notification($msg);
+            return;
         }
     }
     else {