From 0df25eeeb7a3994df499cd6d960515f95a057d44 Mon Sep 17 00:00:00 2001 From: Elias Date: Thu, 8 Jan 2026 14:52:33 +0100 Subject: [PATCH 1/2] Add removeFiles parameter to updateLifecycle method --- .../node/impl/service/defaults/AbstractService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java b/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java index 6f6743a90f..689a397825 100644 --- a/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java +++ b/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java @@ -348,6 +348,10 @@ public void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle) { } protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean switchToDeletedOnStop) { + updateLifecycle(lifeCycle, switchToDeletedOnStop, true); + } + + protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean switchToDeletedOnStop, boolean removeFiles) { try { // prevent multiple service updates at the same time this.lifecycleLock.lock(); @@ -389,7 +393,9 @@ protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean swit LOGGER.info(this.i18n.translate("cloudnet-service-post-stop-message", this.serviceReplacement())); } else if (this.lifeCycle() == ServiceLifeCycle.RUNNING) { this.stopProcess(); - this.doRemoveFilesAfterStop(); + if (removeFiles) { + this.doRemoveFilesAfterStop(); + } // reset the service lifecycle to prepared this.pushServiceInfoSnapshotUpdate(ServiceLifeCycle.PREPARED); } @@ -413,7 +419,7 @@ protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean swit @Override public void restart() { - this.updateLifecycle(ServiceLifeCycle.STOPPED, false); + this.updateLifecycle(ServiceLifeCycle.STOPPED, false, false); this.updateLifecycle(ServiceLifeCycle.RUNNING); } From b804995b1bff91b6818dd4b397e9f324c2eef436 Mon Sep 17 00:00:00 2001 From: Elias Date: Thu, 8 Jan 2026 14:55:04 +0100 Subject: [PATCH 2/2] Refactor updateLifecycle calls to simplify parameters --- .../node/impl/service/defaults/AbstractService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java b/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java index 689a397825..04fb0b6987 100644 --- a/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java +++ b/node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/AbstractService.java @@ -348,7 +348,7 @@ public void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle) { } protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean switchToDeletedOnStop) { - updateLifecycle(lifeCycle, switchToDeletedOnStop, true); + updateLifecycle(lifeCycle, switchToDeletedOnStop, switchToDeletedOnStop); } protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean switchToDeletedOnStop, boolean removeFiles) { @@ -419,7 +419,7 @@ protected void updateLifecycle(@NonNull ServiceLifeCycle lifeCycle, boolean swit @Override public void restart() { - this.updateLifecycle(ServiceLifeCycle.STOPPED, false, false); + this.updateLifecycle(ServiceLifeCycle.STOPPED, false); this.updateLifecycle(ServiceLifeCycle.RUNNING); }