Merge pull request #1032 from yahoo/hmusum/add-json-accesslog-to-xml-schema

Add accesslog type 'json' to schema

4 files changed, 8 insertions, 6 deletions

diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index bf5f106a388..5cc3622893a 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -64,7 +64,7 @@ HttpServer =  element server {
 }
 
 AccessLog = element accesslog {
-    attribute type { string "yapache" | string "vespa" | string "disabled" }? &
+    attribute type { string "yapache" | string "vespa" | string "json" | string "disabled" }? &
     attribute fileNamePattern { string }? &
     attribute symlinkName { string }? &
 
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 520c2d6248b..e8e5206d67a 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
@@ -60,7 +60,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     private Component<?, ?> getVespaAccessLog(String clusterName) {
         ContainerCluster cluster = (ContainerCluster) root.getChildren().get(clusterName);
         return cluster.getComponentsMap().get(ComponentId.fromString((VespaAccessLog.class.getName())));
-
     }
 
     @Test
@@ -99,9 +98,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             assertEquals("interval", fileHandlerConfig.rotation());
             assertEquals(AccessLogConfig.FileHandler.RotateScheme.DATE, fileHandlerConfig.rotateScheme());
         }
-
-
-
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index 94e1392f4d3..9b2fe4f8509 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -18,7 +18,8 @@ import java.io.IOException;
 import java.util.Collections;
 
 /**
- * Utility functions for testing the ContainerModelBuilder
+ * Utility functions for testing the ContainerModelBuilder. Note that XML validation will
+ * not be done when using this class
  *
  * @author gjoranv
  * @since 5.5
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 7d75a406202..ede0ba089a4 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -91,6 +91,11 @@
       </server>
     </http>
 
+    <accesslog type='json'
+           fileNamePattern='logs/vespa/qrs/access-json.%Y%m%d%H%M%S' />
+    <accesslog type='vespa'
+           fileNamePattern='logs/vespa/qrs/access-vespa.%Y%m%d%H%M%S' />
+
     <document-api>
       <binding>http://*/document-api/</binding>
       <binding>https://*/document-api/</binding>