From 10830a089d26562f73b73c16445092de2f02241d Mon Sep 17 00:00:00 2001 From: Yi Shi Date: Thu, 2 Nov 2023 14:49:12 +0800 Subject: [PATCH 1/3] wait before error quit --- src/main/java/com/uid2/operator/Main.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index b540b4ee4..28ba16bce 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -194,12 +194,23 @@ else if (!Utils.isProductionEnvironment()) { return; } + boolean errorQuit = false; + try { Main app = new Main(vertx, ar.result()); app.run(); } catch (Exception e) { LOGGER.error("Error: " + e.getMessage(), e); - ((LoggerContext)org.slf4j.LoggerFactory.getILoggerFactory()).stop(); // flush logs before shutdown + errorQuit = true; + } + + if(errorQuit){ + // allow log to be flushed before quit app. + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // swallow + } vertx.close(); System.exit(1); } From 7096cd0d8a0c37b226caf87a98aa6e1a0421972a Mon Sep 17 00:00:00 2001 From: Yi Shi Date: Fri, 3 Nov 2023 09:14:46 +0800 Subject: [PATCH 2/3] catch all --- src/main/java/com/uid2/operator/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 28ba16bce..86a91caab 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -208,7 +208,7 @@ else if (!Utils.isProductionEnvironment()) { // allow log to be flushed before quit app. try { Thread.sleep(1000); - } catch (InterruptedException e) { + } catch (Exception e) { // swallow } vertx.close(); From cdf94249f06745f90bb783b1f50e56acb79ba8ed Mon Sep 17 00:00:00 2001 From: Yi Shi Date: Fri, 3 Nov 2023 09:15:08 +0800 Subject: [PATCH 3/3] fix imports --- src/main/java/com/uid2/operator/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 86a91caab..e8334e858 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -1,6 +1,5 @@ package com.uid2.operator; -import ch.qos.logback.classic.LoggerContext; import com.google.common.base.Strings; import com.uid2.enclave.IOperatorKeyRetriever; import com.uid2.operator.model.KeyManager;