summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-02-15 13:25:02 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-02-15 13:29:29 +0100
commit1c2f89a0203a50b3c20bb1d56701aa74ebc50266 (patch)
treea29024729661d176b146499a998649679a957603 /container-core
parent9c519b1d3f14fb40f3d66487d6c1dcd6e63e1128 (diff)
Provide fallback ConnectionLog instance for all container types
The ConnectionLog component was previously missing for non-application container clusters (e.g metrics-proxy and cluster-controller). This caused the JettyHttpServer component to always reconstruct on new config.
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 26650cb93a8..0fd31db67f6 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -16,11 +16,9 @@ import com.yahoo.container.di.config.SubscriberFactory;
import com.yahoo.container.di.osgi.BundleClasses;
import com.yahoo.container.di.osgi.OsgiUtil;
import com.yahoo.container.logging.AccessLog;
-import com.yahoo.container.logging.ConnectionLog;
import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
import com.yahoo.jdisc.application.OsgiFramework;
import com.yahoo.jdisc.handler.RequestHandler;
-import com.yahoo.jdisc.http.server.jetty.VoidConnectionLog;
import com.yahoo.jdisc.service.ClientProvider;
import com.yahoo.jdisc.service.ServerProvider;
import com.yahoo.osgi.OsgiImpl;
@@ -144,7 +142,6 @@ public class HandlersConfigurerDi {
bind(com.yahoo.statistics.Statistics.class).toInstance(Statistics.nullImplementation);
bind(AccessLog.class).toInstance(new AccessLog(new ComponentRegistry<>()));
bind(Executor.class).toInstance(Executors.newCachedThreadPool(ThreadFactoryFactory.getThreadFactory("HandlersConfigurerDI")));
- bind(ConnectionLog.class).toInstance(new VoidConnectionLog());
if (vespaContainer.getFileAcquirer() != null)
bind(com.yahoo.filedistribution.fileacquirer.FileAcquirer.class).toInstance(vespaContainer.getFileAcquirer());
}