Added debug log

IHTSDO · May 31, 2023 · 9deb4bf · 9deb4bf
1 parent c7229db
commit 9deb4bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/org/ihtsdo/buildcloud/core/service/manager/BuildStatusListenerService.java b/src/main/java/org/ihtsdo/buildcloud/core/service/manager/BuildStatusListenerService.java
@@ -199,7 +199,7 @@ private void updateStatus(final Map<String, Object> message) throws JsonProcessi
 			LOGGER.info("Status tracking stats for build id {}: It took {} minutes in total from start to {}", buildId, totalTimeTaken, status);
 		}
 		LOGGER.info("Web socket status update {}", message);
-		simpMessagingTemplate.convertAndSend("/topic/snomed-release-service-websocket", objectMapper.writeValueAsString(message));
+		simpMessagingTemplate.convertAndSend("/topic/build-status-change", objectMapper.writeValueAsString(message));
 	}
 
 

diff --git a/src/main/java/org/ihtsdo/buildcloud/core/service/monitor/MonitorServiceImpl.java b/src/main/java/org/ihtsdo/buildcloud/core/service/monitor/MonitorServiceImpl.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 @ConditionalOnProperty(name = "srs.manager", havingValue = "true")
 @Service
@@ -27,7 +28,7 @@ public class MonitorServiceImpl implements MonitorService {
 
 	private boolean started;
 
-	private final Set<Monitor> monitors = new HashSet<>();
+	private final Set<Monitor> monitors = ConcurrentHashMap.newKeySet();
 
 	@Value("${srs.build.maxTimeToRun}")
 	private int maxTimeToRun;
@@ -72,7 +73,9 @@ private void start() {
 			try {
 				logger.info("Start monitoring..");
 				while (true) {
-					Iterator iterator = monitors.iterator();
+					logger.info("Running monitor..");
+					logger.info("Monitor size: {}", this.monitors.size());
+					Iterator iterator = this.monitors.iterator();
 					while(iterator.hasNext()) {
 						Monitor monitor = (Monitor) iterator.next();
 						if (monitor != null) {
@@ -86,7 +89,7 @@ private void start() {
 									// Remove build from monitoring
 									synchronized (monitors) {
 										if (monitors.contains(monitor)) {
-											monitors.remove(monitor);
+											iterator.remove();
 										}
 									}
 
@@ -104,7 +107,7 @@ private void start() {
 								synchronized (monitors) {
 									if (monitors.contains(monitor)) {
 										logger.warn("Monitor run failed, removing {}.", monitor, e);
-										monitors.remove(monitor);
+										iterator.remove();
 									}
 								}
 							}