From e6dfc673275cd8c5515196aa52e6d771121787c3 Mon Sep 17 00:00:00 2001 From: bjormel Date: Wed, 11 May 2022 16:34:33 +0200 Subject: Hosted: Do not use clusterId as part of filename for ConnectionLog --- .../java/com/yahoo/container/logging/ConnectionLogHandler.java | 8 +++++--- .../main/java/com/yahoo/container/logging/FileConnectionLog.java | 2 +- .../configdefinitions/container.logging.connection-log.def | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'container-core/src') diff --git a/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java index a572f0be998..90d7aef1803 100644 --- a/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java +++ b/container-core/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java @@ -9,13 +9,15 @@ class ConnectionLogHandler { private final LogFileHandler logFileHandler; public ConnectionLogHandler(String logDirectoryName, int bufferSize, String clusterName, - int queueSize, LogWriter logWriter) { + int queueSize, LogWriter logWriter, boolean useClusterIdInFileName) { logFileHandler = new LogFileHandler<>( LogFileHandler.Compression.ZSTD, bufferSize, - String.format("logs/vespa/%s/ConnectionLog.%s.%s", logDirectoryName, clusterName, "%Y%m%d%H%M%S"), + useClusterIdInFileName ? String.format("logs/vespa/%s/ConnectionLog.%s.%s", logDirectoryName, clusterName, "%Y%m%d%H%M%S") : + String.format("logs/vespa/%s/ConnectionLog.%s", logDirectoryName, "%Y%m%d%H%M%S"), "0 60 ...", - String.format("ConnectionLog.%s", clusterName), + useClusterIdInFileName ? String.format("ConnectionLog.%s", clusterName) : + "ConnectionLog.", queueSize, "connection-logger", logWriter); diff --git a/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java index 72c93443d31..57b4783153d 100644 --- a/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java +++ b/container-core/src/main/java/com/yahoo/container/logging/FileConnectionLog.java @@ -15,7 +15,7 @@ public class FileConnectionLog extends AbstractComponent implements ConnectionLo @Inject public FileConnectionLog(ConnectionLogConfig config) { logHandler = new ConnectionLogHandler(config.logDirectoryName(), config.bufferSize(), config.cluster(), - queueSize(config), new JsonConnectionLogWriter()); + queueSize(config), new JsonConnectionLogWriter(), config.useClusterIdInFileName()); } private static int queueSize(ConnectionLogConfig config) { diff --git a/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def index 026e2a85a8d..0d58684538a 100644 --- a/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def +++ b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def @@ -12,3 +12,6 @@ queueSize int default=10000 # Buffer size for the output stream has a default of 256k bufferSize int default=262144 + +# In hosted Vespa we do not use the clusterId in file names for application containers +useClusterIdInFileName bool default=true \ No newline at end of file -- cgit v1.2.3