diff --git a/pom.xml b/pom.xml index f0f401b..dc767c1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,17 +4,17 @@ ca.jessewhite.activemq activemq-k8s-discovery jar - 1.0.1 + 1.0.2 activemq-k8s-discovery https://github.com/j-white/activemq-k8s-discovery UTF-8 1.8 - 5.14.1 - 1.4.14 + 5.14.4 + 2.2.13 4.12 - 1.7.21 + 1.7.25 @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.6.1 ${java.version} ${java.version} @@ -56,7 +56,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 + 3.0.0 diff --git a/src/main/java/org/apache/activemq/transport/discovery/k8s/KubernetesDiscoveryAgent.java b/src/main/java/org/apache/activemq/transport/discovery/k8s/KubernetesDiscoveryAgent.java index 4f40db8..dd02191 100755 --- a/src/main/java/org/apache/activemq/transport/discovery/k8s/KubernetesDiscoveryAgent.java +++ b/src/main/java/org/apache/activemq/transport/discovery/k8s/KubernetesDiscoveryAgent.java @@ -112,19 +112,22 @@ public void run() { .filter(svc -> !knownServices.contains(svc)) .collect(Collectors.toList()); - // Add them + // Determine the list of services we need to remove + final List servicesToRemove = knownServices.stream() + .filter(svc -> !availableServices.contains(svc)) + .collect(Collectors.toList()); + + LOG.info("Found {} services: {} to add, and {} to remove.", + availableServices.size(), servicesToAdd.size(), servicesToRemove.size()); + + // Add those that need adding for (String service : servicesToAdd) { LOG.info("Adding service: {}", service); listener.onServiceAdd(new SimpleDiscoveryEvent(service)); knownServices.add(service); } - // Determine the list of services we need to remove - final List servicesToRemove = knownServices.stream() - .filter(svc -> !availableServices.contains(svc)) - .collect(Collectors.toList()); - - // Remove them + // Remove those that need removing for (String service : servicesToRemove) { LOG.info("Removing service: {}", service); listener.onServiceRemove(new SimpleDiscoveryEvent(service));