Catch and log any exceptions thrown within the executor service

spring-cloud · Aug 16, 2022 · 17b61c2 · 17b61c2
1 parent 3be261c
commit 17b61c2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...pringframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java b/...pringframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java
@@ -64,8 +64,14 @@ protected void onEvent(ConfigMap configMap) {
 						+ configMap.getMetadata().getName() + " to be published in "
 						+ k8SConfigurationProperties.getRefreshDelay().toMillis() + " milliseconds");
 			}
-			executorService.schedule(() -> triggerRefresh(configMap).subscribe(),
-					k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS);
+			executorService.schedule(() -> {
+				try {
+					triggerRefresh(configMap).subscribe();
+				}
+				catch (Throwable t) {
+					log.warn("Error when refreshing ConfigMap " + configMap.getMetadata().getName(), t);
+				}
+			}, k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS);
 		}
 		else {
 			if (log.isDebugEnabled()) {

diff --git a/.../springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java b/.../springframework/cloud/kubernetes/configuration/watcher/SecretsWatcherChangeDetector.java
@@ -74,8 +74,14 @@ protected void onEvent(Secret secret) {
 						+ " to be published in " + k8SConfigurationProperties.getRefreshDelay().toMillis()
 						+ " milliseconds");
 			}
-			executorService.schedule(() -> triggerRefresh(secret).subscribe(),
-					k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS);
+			executorService.schedule(() -> {
+				try {
+					triggerRefresh(secret).subscribe();
+				}
+				catch (Throwable t) {
+					log.warn("Error when refreshing ConfigMap " + secret.getMetadata().getName(), t);
+				}
+			}, k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS);
 		}
 		else {
 			if (log.isDebugEnabled()) {