default to JSONAccessLog

4 files changed, 14 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index ef180119ac0..d64d8d03481 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -69,7 +69,7 @@ public class ClusterControllerContainer extends Container implements
         addBundle("file:" + getDefaults().underVespaHome("lib/jars/zkfacade-jar-with-dependencies.jar"));
 
         log.log(LogLevel.DEBUG, "Adding access log for cluster controller ...");
-        addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.queryAccessLog, "controller", isHosted));
+        addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, "controller", isHosted));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 08a89011d96..5b98a8e85be 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -708,7 +708,7 @@ public final class ContainerCluster
     }
 
     public void addDefaultSearchAccessLog() {
-        addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.queryAccessLog, getName(), isHostedVespa));
+        addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, getName(), isHostedVespa));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
index ee70032724e..0eb34ead7bf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/AccessLogBuilder.java
@@ -101,7 +101,7 @@ public class AccessLogBuilder {
         AccessLogTypeLiteral typeLiteral =
                 getOptionalAttribute(accessLogSpec, "type").
                         map(AccessLogTypeLiteral::fromAttributeValue).
-                        orElse(AccessLogTypeLiteral.VESPA);
+                        orElse(AccessLogTypeLiteral.JSON);
         AccessLogType logType = logTypeFor(typeLiteral);
         if (logType == null) {
             return Optional.empty();
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 fe81c18f9b0..d545723241e 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
@@ -39,8 +39,10 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
 
         createModel(root, cluster1Elem, cluster2Elem);
 
-        assertNotNull(getVespaAccessLog("cluster1"));
-        assertNull(   getVespaAccessLog("cluster2"));
+        assertNotNull(getJsonAccessLog("cluster1"));
+        assertNull(   getJsonAccessLog("cluster2"));
+        assertNull(getVespaAccessLog("cluster1"));
+        assertNull(getVespaAccessLog("cluster2"));
     }
 
     @Test
@@ -55,12 +57,17 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
 
         createModel(root, clusterElem);
         assertNull(getVespaAccessLog(jdiscClusterId));
+        assertNull(getJsonAccessLog(jdiscClusterId));
     }
 
     private Component<?, ?> getVespaAccessLog(String clusterName) {
         ContainerCluster cluster = (ContainerCluster) root.getChildren().get(clusterName);
         return cluster.getComponentsMap().get(ComponentId.fromString((VespaAccessLog.class.getName())));
     }
+    private Component<?, ?> getJsonAccessLog(String clusterName) {
+        ContainerCluster cluster = (ContainerCluster) root.getChildren().get(clusterName);
+        return cluster.getComponentsMap().get(ComponentId.fromString((JSONAccessLog.class.getName())));
+    }
 
     @Test
     public void access_log_can_be_configured() throws Exception {
@@ -74,6 +81,8 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
                 "</jdisc>" );
 
         createModel(root, clusterElem);
+        assertNotNull(getJsonAccessLog("default"));
+        assertNull(getVespaAccessLog("default"));
 
         { // yapache
             Component<?, ?> accessLogComponent = getContainerComponent("default", YApacheAccessLog.class.getName());