installers write error message in deployment result if fail or need_reboot

Author: Kindratte

src/main/java/org/scm4j/deployer/installers/Copy.java

@@ -37,8 +37,10 @@ else if (filesForDeploy.size() == 1 && fileName != null)
 			}
 			return OK;
 		} catch (IOException e) {
-			log.warn(e.getMessage());
-			return REBOOT_CONTINUE;
+			log.warn(e.toString());
+			DeploymentResult dr = REBOOT_CONTINUE;
+			dr.setErrorMsg(e.toString());
+			return dr;
 		}
 	}
 
@@ -52,7 +54,9 @@ public DeploymentResult undeploy() {
 			return OK;
 		} catch (IOException e) {
 			log.warn(e.toString());
-			return REBOOT_CONTINUE;
+			DeploymentResult dr = REBOOT_CONTINUE;
+			dr.setErrorMsg(e.toString());
+			return dr;
 		}
 	}
 

src/main/java/org/scm4j/deployer/installers/Delete.java

@@ -30,10 +30,13 @@ private DeploymentResult deleteFile(String fileToDelete) {
 		File file = new File(fileToDelete);
 		if (!file.exists())
 			return DeploymentResult.OK;
-		if (file.delete())
+		if (file.delete()) {
 			return DeploymentResult.OK;
-		else
-			return DeploymentResult.FAILED;
+		} else {
+			DeploymentResult dr = DeploymentResult.FAILED;
+			dr.setErrorMsg("File doesn't deleted!");
+			return dr;
+		}
 	}
 
 	@Override

src/main/java/org/scm4j/deployer/installers/Exec.java

@@ -10,9 +10,11 @@
 import org.scm4j.deployer.api.IComponentDeployer;
 import org.scm4j.deployer.api.IDeploymentContext;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -69,7 +71,7 @@ public Exec onStop() {
 	private File defaultDeployExecutable;
 
 	@SneakyThrows
-	public static int exec(List<String> command, Map<String, String> env, File directory) {
+	public static Process exec(List<String> command, Map<String, String> env, File directory) {
 		ProcessBuilder builder = new ProcessBuilder(command)
 				.directory(directory);
 		if (env != null && !env.isEmpty())
@@ -79,18 +81,22 @@ public static int exec(List<String> command, Map<String, String> env, File direc
 		Process p = builder.start();
 		realInheritIO(p.getInputStream(), System.out);
 		realInheritIO(p.getErrorStream(), System.err);
-		return p.waitFor();
+		return p;
 	}
 
 	private static void realInheritIO(final InputStream src, final PrintStream dest) {
 		new Thread(() -> {
 			try (Scanner sc = new Scanner(src)) {
-				while (sc.hasNextLine())
-					dest.println(sc.nextLine());
+				while (sc.hasNextLine()) {
+					String line = sc.nextLine();
+					dest.println(line);
+					log.info(line);
+				}
 			}
 		}).start();
 	}
 
+	@SneakyThrows
 	private DeploymentResult executeCommand(String executable, String[] args, Map<String, String> env) {
 		List<String> command = new ArrayList<>();
 		command.add("cmd");
@@ -110,17 +116,32 @@ private DeploymentResult executeCommand(String executable, String[] args, Map<St
 
 		String workingDirectoryName = workingDirectory != null ? workingDirectory : deploymentPath;
 
-		int exitValue = exec(command, env, new File(workingDirectoryName));
+		Process p = exec(command, env, new File(workingDirectoryName));
+		int exitValue = p.waitFor();
 
 		log.info("Exit value is " + exitValue);
 
 		if (exitValue == needRebootExitValue)
 			return DeploymentResult.NEED_REBOOT;
-		if (!ignoreExitValue && exitValue != 0)
+		if (!ignoreExitValue && exitValue != 0) {
+			DeploymentResult dr = DeploymentResult.FAILED;
+			dr.setErrorMsg(errorStreamToString(p));
 			return DeploymentResult.FAILED;
+		}
 		return DeploymentResult.OK;
 	}
 
+	@SneakyThrows
+	private String errorStreamToString(Process p) {
+		BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+		StringBuilder sb = new StringBuilder();
+		String line;
+		while ((line = br.readLine()) != null) {
+			sb.append(line);
+		}
+		return sb.toString();
+	}
+
 	public Exec setArgs(String... args) {
 		this.args = args;
 		return this;
@@ -160,7 +181,7 @@ private String findLatestUnins(String deploymentPath, String executablePrefix) t
 					.map(Path::toString)
 					.filter(p -> p.startsWith(executablePrefix))
 					.filter(p -> p.endsWith(".exe"))
-					.min(Comparator.reverseOrder())
+					.max(Comparator.naturalOrder())
 					.orElseThrow(() -> new RuntimeException("Can't find executable file to undeploy product"));
 		}
 	}

src/main/java/org/scm4j/deployer/installers/ProcrunDeployer.java

@@ -126,7 +126,7 @@ public DeploymentResult stop() {
 
 	@SneakyThrows
 	private void execute(List<String> command) {
-		int res = Exec.exec(command, null, new File(deploymentPath));
+		int res = Exec.exec(command, null, new File(deploymentPath)).waitFor();
 		if (res != 0)
 			throw new Exception(String.format("%s: %d", command.toString(), res));
 	}

src/main/java/org/scm4j/deployer/installers/Shortcut.java

@@ -82,8 +82,9 @@ public DeploymentResult deploy() {
 			String destFile = dest.getPath().replace('\\', '/') + '/' + name + ".lnk";
 			sl.saveTo(destFile);
 		} catch (IOException e) {
-			log.warn(e.getMessage());
-			return FAILED;
+			DeploymentResult dr = FAILED;
+			dr.setErrorMsg(e.toString());
+			return dr;
 		}
 		return OK;
 	}
@@ -96,8 +97,11 @@ public DeploymentResult undeploy() {
 		File shortcutFile = new File(dest, name + ".lnk");
 		FileUtils.deleteQuietly(shortcutFile);
 		if (shortcutFile.exists()) {
-			log.warn("Can't delete shortcut " + shortcutFile.getPath());
-			return FAILED;
+			String errorMsg = "Can't delete shortcut " + shortcutFile.getPath();
+			log.warn(errorMsg);
+			DeploymentResult dr = FAILED;
+			dr.setErrorMsg(errorMsg);
+			return dr;
 		} else {
 			return OK;
 		}

src/main/java/org/scm4j/deployer/installers/UntillExec.java

@@ -6,12 +6,6 @@
 @Slf4j
 public class UntillExec extends Exec {
 
-	@Override
-	public DeploymentResult stop() {
-		super.stop();
-		return DeploymentResult.OK;
-	}
-
 	@Override
 	public DeploymentResult deploy() {
 		DeploymentResult res = super.deploy();

src/main/java/org/scm4j/deployer/installers/Unzip.java

@@ -18,6 +18,8 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import static org.scm4j.deployer.api.DeploymentResult.REBOOT_CONTINUE;
+
 @Slf4j
 public class Unzip implements IComponentDeployer {
 
@@ -50,7 +52,9 @@ public DeploymentResult deploy() {
 			return DeploymentResult.OK;
 		} catch (IOException e) {
 			log.warn(e.getMessage());
-			return DeploymentResult.REBOOT_CONTINUE;
+			DeploymentResult dr = REBOOT_CONTINUE;
+			dr.setErrorMsg(e.toString());
+			return dr;
 		}
 	}
 
@@ -69,7 +73,9 @@ public DeploymentResult undeploy() {
 			return DeploymentResult.OK;
 		} catch (IOException e) {
 			log.warn(e.getMessage());
-			return DeploymentResult.REBOOT_CONTINUE;
+			DeploymentResult dr = REBOOT_CONTINUE;
+			dr.setErrorMsg(e.toString());
+			return dr;
 		}
 	}