summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/src/test/java/com/yahoo/vespa/config/configsglobal/qr-logging.cfg44
-rw-r--r--container-core/CMakeLists.txt1
-rw-r--r--container-core/src/main/resources/configdefinitions/qr-logging.def38
3 files changed, 0 insertions, 83 deletions
diff --git a/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-logging.cfg b/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-logging.cfg
deleted file mode 100755
index cc640619e3a..00000000000
--- a/config/src/test/java/com/yahoo/vespa/config/configsglobal/qr-logging.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-logger com.yahoo
-speciallog[6]
-speciallog[0].name QueryAccessLog
-speciallog[0].type file
-speciallog[0].filehandler.name QueryAccessLog
-speciallog[0].filehandler.pattern logs/vespa/qrs/QueryAccessLog.%Y%m%d%H%M%S
-speciallog[0].filehandler.rotation "0 60 ..."
-speciallog[0].cachehandler.name QueryAccessLog
-speciallog[0].cachehandler.size 1000
-speciallog[1].name QueryResultLog
-speciallog[1].type cache
-speciallog[1].filehandler.name QueryResultLog
-speciallog[1].filehandler.pattern logs/vespa/qrs/QueryResultLog.%Y%m%d%H%M%S
-speciallog[1].filehandler.rotation "0 60 ..."
-speciallog[1].cachehandler.name QueryResultLog
-speciallog[1].cachehandler.size 1000
-speciallog[2].name ResultImpressionLog
-speciallog[2].type file
-speciallog[2].filehandler.name ResultImpressionLog
-speciallog[2].filehandler.pattern logs/vespa/qrs/ResultImpressionLog.%Y%m%d%H%M%S
-speciallog[2].filehandler.rotation "0 60 ..."
-speciallog[2].cachehandler.name ResultImpressionLog
-speciallog[2].cachehandler.size 1000
-speciallog[3].name ServiceEventLog
-speciallog[3].type cache
-speciallog[3].filehandler.name ServiceEventLog
-speciallog[3].filehandler.pattern logs/vespa/qrs/ServiceEventLog.%Y%m%d%H%M%S
-speciallog[3].filehandler.rotation "0 60 ..."
-speciallog[3].cachehandler.name ServiceEventLog
-speciallog[3].cachehandler.size 1000
-speciallog[4].name ServiceStatusLog
-speciallog[4].type off
-speciallog[4].filehandler.name ServiceStatusLog
-speciallog[4].filehandler.pattern logs/vespa/qrs/ServiceStatusLog.%Y%m%d%H%M%S
-speciallog[4].filehandler.rotation "0 60 ..."
-speciallog[4].cachehandler.name ServiceStatusLog
-speciallog[4].cachehandler.size 1000
-speciallog[5].name ServiceTraceLog
-speciallog[5].type parent
-speciallog[5].filehandler.name ServiceTraceLog
-speciallog[5].filehandler.pattern logs/vespa/qrs/ServiceTraceLog.%Y%m%d%H%M%S
-speciallog[5].filehandler.rotation "0 60 ..."
-speciallog[5].cachehandler.name ServiceTraceLog
-speciallog[5].cachehandler.size 1000
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index bb25c3c5119..aa9291b20d5 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -6,7 +6,6 @@ install_config_definition(src/main/resources/configdefinitions/health-monitor.de
install_config_definition(src/main/resources/configdefinitions/http-filter.def container.core.http.http-filter.def)
install_config_definition(src/main/resources/configdefinitions/metrics-presentation.def metrics.metrics-presentation.def)
install_config_definition(src/main/resources/configdefinitions/mockservice.def container.handler.test.mockservice.def)
-install_config_definition(src/main/resources/configdefinitions/qr-logging.def container.core.qr-logging.def)
install_config_definition(src/main/resources/configdefinitions/qr-searchers.def container.qr-searchers.def)
install_config_definition(src/main/resources/configdefinitions/qr.def container.qr.def)
install_config_definition(src/main/resources/configdefinitions/servlet-config.def container.servlet.servlet-config.def)
diff --git a/container-core/src/main/resources/configdefinitions/qr-logging.def b/container-core/src/main/resources/configdefinitions/qr-logging.def
deleted file mode 100644
index f828f321ae7..00000000000
--- a/container-core/src/main/resources/configdefinitions/qr-logging.def
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=container.core
-logger string default="com.yahoo"
-# Either QueryAccessLog for a regular Vespa access log, or YApacheAccessLog for a log on yApache format
-speciallog[].name string
-
-# Leave as ""
-speciallog[].type string
-
-speciallog[].filehandler.name string default=""
-
-# File name patterns supporting the expected time variables
-speciallog[].filehandler.pattern string default=".%Y%m%d%H%M%S"
-
-speciallog[].filehandler.rotation string default="0 60 ..."
-
-# Defines how file rotation is done. There are two options:
-#
-# "date" :
-# The active log file is given the name resulting from pattern (but in this case "pattern" must yield a
-# time-dependent name. In addition, a symlink is created pointing to the newest file.
-# The symlink is given the name of the symlink parameter (or the name of this service
-# if no parameter is given.
-#
-# "sequence" :
-# The active log file is given the name
-# defined by "pattern" (which in this case will likely just be a constant string).
-# At rotation, this file is given the name pattern.N where N is 1 + the largest integer found by
-# extracting the integers from all files ending by .Integer in the same directory
-#
-speciallog[].filehandler.rotatescheme string default="date"
-
-# Use this as the name of the symlink created pointing to the newest file in the "date" naming scheme.
-# This is ignored if the sequence naming scheme is used.
-speciallog[].filehandler.symlink string default=""
-
-speciallog[].cachehandler.name string default=""
-speciallog[].cachehandler.size int default=1000