diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-02-04 11:52:34 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-02-04 11:52:34 +0100 |
| commit | d2dd556f862f9438500cce95bfbc712eec563251 (patch) | |
| tree | 0f6ad1ad6c5a1be1254b997a1a21b28163176419 /jdisc_http_service | |
| parent | cf73d91645b70eb1a78cbe44f6be31d3ed5979b5 (diff) | |
Override directory name for connection logs in configserver/controller
Diffstat (limited to 'jdisc_http_service')
3 files changed, 6 insertions, 3 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java index 418fe47d3e0..38d979e8138 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java @@ -8,10 +8,10 @@ package com.yahoo.container.logging; class ConnectionLogHandler { private final LogFileHandler<ConnectionLogEntry> logFileHandler; - public ConnectionLogHandler(String clusterName, int queueSize, LogWriter<ConnectionLogEntry> logWriter) { + public ConnectionLogHandler(String logDirectoryName, String clusterName, int queueSize, LogWriter<ConnectionLogEntry> logWriter) { logFileHandler = new LogFileHandler<>( LogFileHandler.Compression.ZSTD, - String.format("logs/vespa/qrs/ConnectionLog.%s.%s", clusterName, "%Y%m%d%H%M%S"), + String.format("logs/vespa/%s/ConnectionLog.%s.%s", logDirectoryName, clusterName, "%Y%m%d%H%M%S"), "0 60 ...", String.format("ConnectionLog.%s", clusterName), queueSize, diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java index 3d09f193864..c28003c74da 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java @@ -17,7 +17,7 @@ public class FileConnectionLog extends AbstractComponent implements ConnectionLo @Inject public FileConnectionLog(ConnectionLogConfig config) { - logHandler = new ConnectionLogHandler(config.cluster(), config.queueSize(), new JsonConnectionLogWriter()); + logHandler = new ConnectionLogHandler(config.cluster(), config.logDirectoryName(), config.queueSize(), new JsonConnectionLogWriter()); } @Override diff --git a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def b/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def index 409419b10ac..e845a8351d5 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def @@ -3,5 +3,8 @@ namespace=container.logging # Name of the cluster cluster string +# Log directory name +logDirectoryName string default="qrs" + # Max queue length of file handler queueSize int default=10000
\ No newline at end of file |