SONAR-6950 actually log error during cleanup of CE container

1 files changed, 10 insertions, 2 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java
index fee223a331f..2c96179620d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java
@@ -37,9 +37,9 @@ import org.sonar.server.computation.activity.ActivityManager;
 import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl;
 import org.sonar.server.computation.batch.BatchReportReaderImpl;
 import org.sonar.server.computation.component.DbComponentsRefCache;
+import org.sonar.server.computation.component.ProjectSettingsRepository;
 import org.sonar.server.computation.component.TreeRootHolderImpl;
 import org.sonar.server.computation.event.EventRepositoryImpl;
-import org.sonar.server.computation.component.ProjectSettingsRepository;
 import org.sonar.server.computation.issue.IssueCache;
 import org.sonar.server.computation.issue.IssueComputation;
 import org.sonar.server.computation.issue.RuleCache;
@@ -153,7 +153,15 @@ public class ComputeEngineContainerImpl extends ComponentContainer implements Co
   }
 
   public void cleanup() {
-    stopComponents(true);
+    ReportQueue.Item item = null;
+    try {
+      item = getComponentByType(ReportQueue.Item.class);
+      stopComponents();
+    } catch (Throwable t) {
+      Loggers.get(ComputeEngineContainerImpl.class).error(
+        String.format("Cleanup of container for item '%s' failed", item == null ? null : item.dto),
+        t);
+    }
   }
 
   @Override