diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-10-08 15:08:28 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-10-08 15:08:28 +0200 |
commit | 8785946c7866877fccb455767e8cf58a41b81b69 (patch) | |
tree | 02a116a093415b1bd3f55606373dc527eca5248f /jdisc_http_service | |
parent | 73c361381cd6be306083c1776bf198f9a5bcebf0 (diff) |
Simplify thread construction to use DaemonThreadFactory
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index f172fd07c0f..7fa645debe7 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -1,10 +1,10 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.server.jetty; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; +import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.container.logging.AccessLog; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.http.ConnectorConfig; @@ -49,7 +49,6 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -76,7 +75,6 @@ public class JettyHttpServer extends AbstractServerProvider { Metric metric, ServerConfig serverConfig, ServletPathsConfig servletPathsConfig, - ThreadFactory threadFactory, FilterBindings filterBindings, ComponentRegistry<ConnectorFactory> connectorFactories, ComponentRegistry<ServletHolder> servletHolders, @@ -101,7 +99,7 @@ public class JettyHttpServer extends AbstractServerProvider { listenedPorts.add(connectorConfig.listenPort()); } - janitor = newJanitor(threadFactory); + janitor = newJanitor(); JDiscContext jDiscContext = new JDiscContext(filterBindings.getRequestFilters().activate(), filterBindings.getResponseFilters().activate(), @@ -127,11 +125,7 @@ public class JettyHttpServer extends AbstractServerProvider { int numMetricReporterThreads = 1; metricReporterExecutor = Executors.newScheduledThreadPool(numMetricReporterThreads, - new ThreadFactoryBuilder() - .setDaemon(true) - .setNameFormat(JettyHttpServer.class.getName() + "-MetricReporter-%d") - .setThreadFactory(threadFactory) - .build()); + new DaemonThreadFactory(JettyHttpServer.class.getName() + "-MetricReporter-")); metricReporterExecutor.scheduleAtFixedRate(new MetricTask(), 0, 2, TimeUnit.SECONDS); } @@ -218,17 +212,12 @@ public class JettyHttpServer extends AbstractServerProvider { return ports.stream().map(Object::toString).collect(Collectors.joining(":")); } - private static ExecutorService newJanitor(ThreadFactory factory) { + private static ExecutorService newJanitor() { int threadPoolSize = Runtime.getRuntime().availableProcessors(); log.info("Creating janitor executor with " + threadPoolSize + " threads"); return Executors.newFixedThreadPool( threadPoolSize, - new ThreadFactoryBuilder() - .setDaemon(true) - .setNameFormat(JettyHttpServer.class.getName() + "-Janitor-%d") - .setThreadFactory(factory) - .build() - ); + new DaemonThreadFactory(JettyHttpServer.class.getName() + "-Janitor-")); } @Override |