TS-31571 Some rework

cqse · Oct 17, 2024 · 55f347c · 55f347c
1 parent fa4b88d
commit 55f347c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/logging/LogToTeamscaleAppender.java b/agent/src/main/java/com/teamscale/jacoco/agent/logging/LogToTeamscaleAppender.java
@@ -11,6 +11,7 @@
 import org.conqat.lib.commons.collections.IdentityHashSet;
 import retrofit2.Call;
 
+import java.net.ConnectException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -57,6 +58,7 @@ public void start() {
 		super.start();
 		scheduler.scheduleAtFixedRate(() -> {
 			synchronized (activeLogFlushes) {
+				activeLogFlushes.removeIf(CompletableFuture::isDone);
 				if (this.activeLogFlushes.isEmpty()) {
 					flush();
 				}
@@ -114,10 +116,15 @@ private void sendLogs(List<ProfilerLogEntry> logsToSend) {
 						logsToSend.forEach(logBuffer::remove);
 					}
 				} catch (Exception e) {
-					System.err.println("Sending logs to Teamscale failed: " + e.getMessage());
+					// We do not report on connection exceptions here.
+					if (!(e instanceof ConnectException)) {
+						System.err.println("Sending logs to Teamscale failed: " + e.getMessage());
+					}
 				}
 			}).whenComplete((result, throwable) -> {
-				activeLogFlushes.removeIf(CompletableFuture::isDone);
+				synchronized (activeLogFlushes) {
+					activeLogFlushes.removeIf(CompletableFuture::isDone);
+				}
 			}));
 		}
 	}