diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-20 15:31:15 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:22 +0100 |
commit | c40265a5a0f399bc2e9a12025d0124edec7d0bf8 (patch) | |
tree | 3062e6a21ead6d58ac7e7d92d4086d38c3b332d7 | |
parent | 7b58424ddd4cdf0c2e963cd89bac83dcf8566381 (diff) |
Remove further traces of rotationScheme.
4 files changed, 5 insertions, 8 deletions
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index fdb5b3193f5..a30f61809ad 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -72,8 +72,7 @@ AccessLog = element accesslog { attribute compressOnRotation { xsd:boolean }? & attribute symlinkName { string }? & - attribute rotationInterval { string }? & - attribute rotationScheme { string "date" | string "sequence" }? + attribute rotationInterval { string }? } SecretStore = element secret-store { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java index 817d9a943e0..fe81c18f9b0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java @@ -67,11 +67,9 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { Element clusterElem = DomBuilderTest.parse( "<jdisc id='default' version='1.0'>", " <accesslog type='yapache' ", - " fileNamePattern='pattern' rotationInterval='interval'", - " rotationScheme='date' />", + " fileNamePattern='pattern' rotationInterval='interval' />", " <accesslog type='json' ", - " fileNamePattern='pattern' rotationInterval='interval'", - " rotationScheme='date' />", + " fileNamePattern='pattern' rotationInterval='interval' />", nodesXml, "</jdisc>" ); diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index cacbd45ed8e..84ec87d06ba 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -14,7 +14,7 @@ <initiallyInRotation>false</initiallyInRotation> </config> - <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" rotationScheme="date" compressOnRotation="true" symlinkName="access.log" /> + <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" compressOnRotation="true" symlinkName="access.log" /> <preprocess:include file='access-logging.xml' required='false' /> <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" /> diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml index f1cfeb69660..db00c686c99 100644 --- a/node-admin/src/main/application/services.xml +++ b/node-admin/src/main/application/services.xml @@ -3,7 +3,7 @@ <services version="1.0" xmlns:preprocess="properties"> <container id="node-admin" version="1.0"> <!-- Please update container test when changing this file --> - <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" /> + <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" symlinkName="access.log" /> <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/> <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/> |