Ensure container logs are printed before deleting the pod

Author: Vlatombe

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/retention/Reaper.java

@@ -240,7 +240,7 @@ public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonN
                     LOGGER.info(() -> ns + "/" + name + " Container " + c.getName() + " was just terminated, so removing the corresponding Jenkins agent");
                     runListener.getLogger().printf("%s/%s Container %s was terminated (Exit Code: %d, Reason: %s)%n", ns, name, c.getName(), t.getExitCode(), t.getReason());
                 });
-                node.terminate();
+                logLastLinesThenTerminateNode(node, pod, runListener);
             }
         }
     }
@@ -258,17 +258,21 @@ public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonN
                 TaskListener runListener = node.getTemplate().getListener();
                 LOGGER.info(() -> ns + "/" + name + " Pod just failed. Removing the corresponding Jenkins agent. Reason: " + pod.getStatus().getReason() + ", Message: " + pod.getStatus().getMessage());
                 runListener.getLogger().printf("%s/%s Pod just failed (Reason: %s, Message: %s)%n", ns, name, pod.getStatus().getReason(), pod.getStatus().getMessage());
-                try {
-                    String lines = PodUtils.logLastLines(pod, node.getKubernetesCloud().connect());
-                    if (lines != null) {
-                        runListener.getLogger().print(lines);
-                    }
-                } catch (KubernetesAuthException e) {
-                    LOGGER.log(Level.FINE, e, () -> "Unable to get logs after pod failed event");
-                } finally {
-                    node.terminate();
-                }
+                logLastLinesThenTerminateNode(node, pod, runListener);
+            }
+        }
+    }
+
+    private static void logLastLinesThenTerminateNode(KubernetesSlave node, Pod pod, TaskListener runListener) throws IOException, InterruptedException {
+        try {
+            String lines = PodUtils.logLastLines(pod, node.getKubernetesCloud().connect());
+            if (lines != null) {
+                runListener.getLogger().print(lines);
             }
+        } catch (KubernetesAuthException e) {
+            LOGGER.log(Level.FINE, e, () -> "Unable to get logs after pod failed event");
+        } finally {
+            node.terminate();
         }
     }