From aab3e945d4d0bb470653eded13c8c61d04781218 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Sat, 15 May 2021 11:40:40 +0100 Subject: [PATCH] improve setup.php to apply database updates and avoid deadlock with not being able to login - see https://github.com/postfixadmin/postfixadmin/issues/494 --- public/setup.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/public/setup.php b/public/setup.php index 2228c1dd..0ef7a5a9 100644 --- a/public/setup.php +++ b/public/setup.php @@ -333,23 +333,29 @@ EOF;

Database Update

getMessage()); + echo "

Something went wrong while trying to connect to the database. A message should be logged - check PHP's error_log (" . ini_get('error_log') . ')

\n'; + error_log("Couldn't perform PostfixAdmin database update - failed to connect to db? " . $e->getMessage() . " Trace: " . $e->getTraceAsString()); } if ($db) { - print "

Everything seems fine... attempting to create/update database structure

\n"; - require_once(dirname(__FILE__) . '/upgrade.php'); + echo "

Everything seems fine... attempting to create/update database structure

\n"; + try { + require_once(dirname(__FILE__) . '/upgrade.php'); + } + catch(\Exception $e) { + if($authenticated) { + echo "

Exception message: {$e->getMessage()} - check logs!

"; + } + echo "

Something went wrong while trying to apply database updates, a message should be logged - check PHP's error_log (" . ini_get('error_log') . ')

\n'; + error_log("Couldn't perform PostfixAdmin database update via upgrade.php - " . $e->getMessage() . " Trace: " . $e->getTraceAsString()); + } } else { echo "

Could not connect to database to perform updates; check PHP error log.

"; } - } else { - echo "

Please login to see perform database update.

"; - } ?>