Stop subscribing to config that is static

File acquirer will always use localhost:19090 for getting files now,
remove need for subscribing to qr config.
Will also remove restart log message when e.g. moving logserver
to a new node

2 files changed, 4 insertions, 10 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java
index c86f53d86bb..7f46c6d8a02 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -95,18 +95,11 @@ public class Container {
     }
 
     // Only intended for use by the Server instance.
-    public void setupFileAcquirer(QrConfig.Filedistributor filedistributorConfig) {
+    public void setupFileAcquirer() {
         if (usingCustomFileAcquirer)
             return;
 
-        if (filedistributorConfig.configid().isEmpty()) {
-            if (fileAcquirer != null)
-                logger.warning("Disabling file distribution");
-            fileAcquirer = null;
-        } else {
-            fileAcquirer = FileAcquirerFactory.create(filedistributorConfig.configid());
-        }
-
+        fileAcquirer = FileAcquirerFactory.create();
         setPathAcquirer(fileAcquirer);
     }
 
diff --git a/container-core/src/main/resources/configdefinitions/container.qr.def b/container-core/src/main/resources/configdefinitions/container.qr.def
index ba2207541e8..e49e334a299 100644
--- a/container-core/src/main/resources/configdefinitions/container.qr.def
+++ b/container-core/src/main/resources/configdefinitions/container.qr.def
@@ -5,7 +5,8 @@ namespace=container
 ### connection to the config system
 
 ## filedistributor rpc configuration
-filedistributor.configid reference default="" restart
+## TODO: Unused, remove in Vespa 9
+filedistributor.configid reference default=""
 
 ## Is RPC server enabled?
 rpc.enabled bool default=false restart