From 642e65e097fd0b315eddd4ead9b7389de07b4527 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 5 Jun 2019 12:16:17 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31446 --- .../run-mediacube-server-localhost.launch | 2 +- .../run-mediacube-server.launch | 30 ------------------- .../ProjectCleanupMountedLocationStep.java | 11 +++++-- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 server/-configuration/run-mediacube-server.launch diff --git a/server/-configuration/run-mediacube-server-localhost.launch b/server/-configuration/run-mediacube-server-localhost.launch index 0f6f1385..75a5031d 100644 --- a/server/-configuration/run-mediacube-server-localhost.launch +++ b/server/-configuration/run-mediacube-server-localhost.launch @@ -22,7 +22,7 @@ - + diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch deleted file mode 100644 index 2ecf882c..00000000 --- a/server/-configuration/run-mediacube-server.launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java index 27f1b5e1..560d8536 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -188,9 +189,13 @@ public class ProjectCleanupMountedLocationStep extends JobStep implements FileVi Path parent = getProjectRootPath(filePath); if (parent != null) { Path pathToDelete = Paths.get(sourcePath.toAbsolutePath().toString(), filePath.getName(sourcePath.getNameCount()).toString()); - //FileUtils.deleteDirectory(pathToDelete); - logger.info(marker, "A {} mappa törölhető", pathToDelete); - System.out.println(pathToDelete); + try { + FileUtils.deleteDirectory(pathToDelete.toFile()); + logger.info(marker, "A {} mappa sikeresen törlődött", pathToDelete); + } catch (IOException e) { + logger.error(marker, "A {} mappa törlése nem lehetséges, a rendszer üzenete: {}", pathToDelete, e.getMessage()); + logger.error(e); + } } else logger.warn(marker, "A {} fájlhoz nem határozható meg a törlendő szülőkönyvtár.", filePath); return true; -- 2.54.0