[2/6] incubator-trafficcontrol git commit: sensible error message when db connect fails

[de...@apache.org]

sensible error message when db connect fails


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9a93f2e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9a93f2e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9a93f2e3

Branch: refs/heads/master
Commit: 9a93f2e3c538bcb58c81854ade66a193b1fdd6ae
Parents: 48ffbc1
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed May 24 20:20:55 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed May 24 16:27:55 2017 -0600

----------------------------------------------------------------------
 traffic_ops/install/bin/_postinstall | 5 +++++
 traffic_ops/install/lib/Database.pm  | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9a93f2e3/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index d028c68..09b1b3b 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -850,6 +850,11 @@ sub main {
     setupCertificates( $opensslconf );
 
     my $dbh = Database::connect($databaseConfFile, $todbconf);
+    if (!$dbh) {
+        InstallUtils::logger("Can't connect to the database.  Use the script `/opt/traffic_ops/install/bin/db_bootstrap.sh` on the db server to create it and run `postinstall` again.", "error");
+        exit(-1);
+    }
+
     setupDatabaseData( $dbh, $adminconf, $paramconf );
 
     InstallUtils::logger("Starting Traffic Ops", "info" );

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9a93f2e3/traffic_ops/install/lib/Database.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/Database.pm b/traffic_ops/install/lib/Database.pm
index be6310d..8fc545d 100644
--- a/traffic_ops/install/lib/Database.pm
+++ b/traffic_ops/install/lib/Database.pm
@@ -45,10 +45,10 @@ sub connect {
         InstallUtils::logger( "Database connection succeeded", "info" );
     }
     else {
-        InstallUtils::logger( "Error connecting to database", "error" );
-        exit(-1);
+        # show error, but don't exit -- let the caller deal with it based on undef $dbh
+        InstallUtils::logger( $DBI::errstr, "error" );
     }
-   return $dbh;
+    return $dbh;
 }