diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-26 20:11:37 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-26 20:28:11 +0100 |
commit | 7e2e5b1421cc9da74f9abe7890f6cccf2d34e567 (patch) | |
tree | dea73c2d47c1bcc38c1e7e2159139467509b9b9c /jdisc_http_service/src | |
parent | ec7e9b9ef8ad340ed7724b0b699cfeddffddc3f7 (diff) |
Close log handler on component graph deconstruction
Diffstat (limited to 'jdisc_http_service/src')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java | 8 | ||||
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java index 2cea7f7dd04..ece9d0d2c4a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/JSONAccessLog.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.logging; +import com.yahoo.component.AbstractComponent; import com.yahoo.container.core.AccessLogConfig; /** @@ -9,7 +10,7 @@ import com.yahoo.container.core.AccessLogConfig; * @author frodelu * @author Tony Vaagenes */ -public final class JSONAccessLog implements RequestLogHandler { +public final class JSONAccessLog extends AbstractComponent implements RequestLogHandler { private final AccessLogHandler logHandler; @@ -22,8 +23,5 @@ public final class JSONAccessLog implements RequestLogHandler { logHandler.log(entry); } - // TODO: This is never called. We should have a DI provider and call this method from its deconstruct. - public void shutdown() { - logHandler.shutdown(); - } + @Override public void deconstruct() { logHandler.shutdown(); } } diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java index 33ec736443c..254b7fe5385 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/VespaAccessLog.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.logging; +import com.yahoo.component.AbstractComponent; import com.yahoo.container.core.AccessLogConfig; import java.io.IOException; @@ -14,7 +15,7 @@ import java.util.TimeZone; * @author Bjorn Borud * @author Oyvind Bakksjo */ -public final class VespaAccessLog implements RequestLogHandler, LogWriter<RequestLogEntry> { +public final class VespaAccessLog extends AbstractComponent implements RequestLogHandler, LogWriter<RequestLogEntry> { private static final ThreadLocal<SimpleDateFormat> dateFormat = ThreadLocal.withInitial(VespaAccessLog::createDateFormat); @@ -84,13 +85,7 @@ public final class VespaAccessLog implements RequestLogHandler, LogWriter<Reques sb.append(numbers); } - /** - * TODO: This is never called. We should have a DI provider and call this method from its deconstruct. - */ - public void shutdown() { - if (logHandler!=null) - logHandler.shutdown(); - } + @Override public void deconstruct() { logHandler.shutdown(); } @Override public void log(RequestLogEntry entry) { |