From 464f98fe34d1a9e030b7fd43f5b0ef40869e42ad Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jun 2019 12:42:30 +0200 Subject: Remove unused ServiceListener interface. --- .../ai/vespa/metricsproxy/service/ServiceListener.java | 14 -------------- .../java/ai/vespa/metricsproxy/service/SystemPoller.java | 10 ++-------- .../ai/vespa/metricsproxy/service/SystemPollerTest.java | 3 +-- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java (limited to 'metrics-proxy/src') diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java deleted file mode 100644 index 810eb5fb908..00000000000 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ServiceListener.java +++ /dev/null @@ -1,14 +0,0 @@ -/* -* Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - */ - -package ai.vespa.metricsproxy.service; - -import java.util.List; - -/** - * @author Unknown - */ -public interface ServiceListener { - void setServices(List services); -} diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java index e19d65f2838..e33674e87b0 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java @@ -26,11 +26,11 @@ import java.util.logging.Logger; * * @author Eirik Nygaard */ -public class SystemPoller implements ServiceListener { +public class SystemPoller { final private static Logger log = Logger.getLogger(SystemPoller.class.getName()); private final int pollingIntervalSecs; - private volatile List services; + private final List services; private final int memoryTypeVirtual = 0; private final int memoryTypeResident = 1; @@ -45,12 +45,6 @@ public class SystemPoller implements ServiceListener { systemPollTimer = new Timer("systemPollTimer", true); } - @Override - public void setServices(List services) { - log.log(LogLevel.DEBUG, "Setting services in SystemPoller to: " + services); - this.services = services; - } - void stop() { systemPollTimer.cancel(); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java index a42d52b7ea6..c5f2ea6960b 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/SystemPollerTest.java @@ -25,8 +25,7 @@ public class SystemPollerTest { SystemPoller poller = new SystemPoller(services, 60*5); assertThat(s.isAlive(), is(false)); - services.remove(0); - poller.setServices(services); + long n = poller.getPidJiffies(s); assertThat(n, is(0L)); long[] memusage = poller.getMemoryUsage(s); -- cgit v1.2.3