From eb479a5207ea2b536b8d4cc78afa17203ff29be7 Mon Sep 17 00:00:00 2001 From: jonmv Date: Thu, 31 Aug 2023 08:25:32 +0200 Subject: Shut down loggers on deconstruct, and do this in unit test instead of sleep --- .../main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java') diff --git a/container-search/src/main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java b/container-search/src/main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java index 601da11ab33..0fcc54493e3 100644 --- a/container-search/src/main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java +++ b/container-search/src/main/java/com/yahoo/search/logging/AbstractSpoolingLogger.java @@ -54,8 +54,9 @@ public abstract class AbstractSpoolingLogger extends AbstractThreadedLogger impl return true; } - // TODO Call from a component or make this class a component - public void shutdown() { + @Override + public void deconstruct() { + super.deconstruct(); executorService.shutdown(); try { if ( ! executorService.awaitTermination(10, TimeUnit.SECONDS)) -- cgit v1.2.3