From b53f5d1c498fd71c305e8c2994e40bc0aa9fe7af Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Mon, 6 Jan 2020 10:41:26 -0500 Subject: [PATCH] check table even if db connection is ok --- .../server/listener/SystemInitializerListener.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java index e1c66ea..f75fba2 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java @@ -39,11 +39,12 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase { try { config.execSql("select 1"); + checkTable(config); log.info("database configured OK, skipping initialization"); return; } catch (Exception e) { - log.warn(PREFIX+"database not configured, attempting to initialize..."); + log.warn(PREFIX+"database not properly configured, attempting to initialize..."); } try { @@ -84,7 +85,11 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase { die(PREFIX+"database configuration failed, cannot run test query: "+shortError(e)); } - // does a proper table exist? + checkTable(config); + super.beforeStart(server); + } + + public void checkTable(PgRestServerConfiguration config) { if (!empty(checkTable)) { if (!checkSafeShellArg(checkTable)) invalidName("invalid table name", checkTable); try { @@ -94,8 +99,6 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase { config.getDatabase().getHibernate().setHbm2ddlAuto("create"); } } - - super.beforeStart(server); } @Override public void onStart(RestServer server) {