fix: interrupt processLogsAndUpload

aws-greengrass · Oct 5, 2023 · b4cef92 · b4cef92
1 parent 29d55ee
commit b4cef92
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/aws/greengrass/logmanager/LogManagerService.java b/src/main/java/com/aws/greengrass/logmanager/LogManagerService.java
@@ -683,7 +683,7 @@ private void updatelastComponentUploadedLogFile(Map<String, Instant> lastCompone
      */
     @SuppressWarnings("PMD.CollapsibleIfStatements")
     private void processLogsAndUpload() throws InterruptedException {
-        while (true) {
+        while (!Thread.currentThread().isInterrupted()) {
             //TODO: this is only done for passing the current text. But in practise, we don`t need to intentionally
             // sleep here.
             if (!isCurrentlyUploading.compareAndSet(false, true)) {
@@ -702,6 +702,9 @@ private void processLogsAndUpload() throws InterruptedException {
                 try {
                     LogFileGroup logFileGroup = LogFileGroup.create(componentLogConfiguration,
                             lastUploadedLogFileTimeMs, workDir);
+                    if (Thread.currentThread().isInterrupted()) {
+                        return;
+                    }
 
                     if (logFileGroup.getLogFiles().isEmpty()) {
                         continue;