From 32e253f28d0fbb98dfd69810810223a2e3d74bf6 Mon Sep 17 00:00:00 2001 From: Iurii Ignatko Date: Sun, 15 Jul 2018 12:13:32 +0300 Subject: [PATCH 1/2] Exit application if environment verification failed --- .../sixt/service/framework/JettyServiceBase.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sixt/service/framework/JettyServiceBase.java b/src/main/java/com/sixt/service/framework/JettyServiceBase.java index 1fa3c9b..686a0e3 100644 --- a/src/main/java/com/sixt/service/framework/JettyServiceBase.java +++ b/src/main/java/com/sixt/service/framework/JettyServiceBase.java @@ -94,18 +94,16 @@ public static void main(String[] args) { //we have to start the container before service registration happens to know the port service.startJettyContainer(); - Annotation[] serviceAnnos = serviceClass.getAnnotations(); - service.initializeServiceRegistration(); - service.verifyEnvironment(); + verifyEnvironmentAndExistIfNeeded(service); //we start health checks first so we can see services with bad state if (!hcProviders.isEmpty()) { service.initializeHealthCheckManager(hcProviders); } - if (hasAnnotation(serviceAnnos, EnableDatabaseMigration.class)) { + if (hasAnnotation(serviceClass.getAnnotations(), EnableDatabaseMigration.class)) { //this will block until the database is available. //it will then attempt a migration. if the migration fails, // the process emits an error and pauses. it's senseless to continue. @@ -127,6 +125,15 @@ private static void displayHelpAndExitIfNeeded(String[] args, AbstractService se } } + private static void verifyEnvironmentAndExistIfNeeded(AbstractService service) { + try { + service.verifyEnvironment(); + } catch (Exception e) { + logger.error("Error while verifying environment - {}", e.getMessage(), e); + System.exit(-1); + } + } + private static void verifyDefaultCharset() { String charset = Charset.defaultCharset().name(); logger.info("Found charset {}", charset); From 39eaab031a12b3d109ac49bacd235891a7aebbed Mon Sep 17 00:00:00 2001 From: Iurii Ignatko Date: Mon, 16 Jul 2018 12:02:11 +0300 Subject: [PATCH 2/2] Fix a typo in a method name --- .../java/com/sixt/service/framework/JettyServiceBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sixt/service/framework/JettyServiceBase.java b/src/main/java/com/sixt/service/framework/JettyServiceBase.java index 686a0e3..acd2b44 100644 --- a/src/main/java/com/sixt/service/framework/JettyServiceBase.java +++ b/src/main/java/com/sixt/service/framework/JettyServiceBase.java @@ -96,7 +96,7 @@ public static void main(String[] args) { service.initializeServiceRegistration(); - verifyEnvironmentAndExistIfNeeded(service); + verifyEnvironmentAndExitIfNeeded(service); //we start health checks first so we can see services with bad state if (!hcProviders.isEmpty()) { @@ -125,7 +125,7 @@ private static void displayHelpAndExitIfNeeded(String[] args, AbstractService se } } - private static void verifyEnvironmentAndExistIfNeeded(AbstractService service) { + private static void verifyEnvironmentAndExitIfNeeded(AbstractService service) { try { service.verifyEnvironment(); } catch (Exception e) {