apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-24 21:35:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fail fast if the daemon can not be started, fixes #162

Browse Source
This commit is contained in:
Guillaume Nodet
2020-11-02 10:59:18 +01:00
parent 5b5eab4908
commit a95ac9e4dc
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java
View File

@@ -222,7 +222,8 @@ public class DaemonConnector {
} }
public DaemonClientConnection startDaemon(DaemonCompatibilitySpec constraint) { public DaemonClientConnection startDaemon(DaemonCompatibilitySpec constraint) {
final String daemon = startDaemon(); final String daemon = UUID.randomUUID().toString();
final Process process = startDaemon(daemon);
LOGGER.debug("Started Maven daemon {}", daemon); LOGGER.debug("Started Maven daemon {}", daemon);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
do { do {
@@ -235,14 +236,12 @@ public class DaemonConnector {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new DaemonException.InterruptedException(e); throw new DaemonException.InterruptedException(e);
} }
} while (System.currentTimeMillis() - start < DEFAULT_CONNECT_TIMEOUT); } while (process.isAlive() && System.currentTimeMillis() - start < DEFAULT_CONNECT_TIMEOUT);
DaemonDiagnostics diag = new DaemonDiagnostics(daemon, layout); DaemonDiagnostics diag = new DaemonDiagnostics(daemon, layout);
throw new DaemonException.ConnectException("Timeout waiting to connect to the Maven daemon.\n" + diag.describe()); throw new DaemonException.ConnectException("Timeout waiting to connect to the Maven daemon.\n" + diag.describe());
} }
private String startDaemon() { private Process startDaemon(String uid) {
final String uid = UUID.randomUUID().toString();
final Path mavenHome = layout.mavenHome(); final Path mavenHome = layout.mavenHome();
final Path workingDir = layout.userDir(); final Path workingDir = layout.userDir();
String command = ""; String command = "";
@@ -272,13 +271,13 @@ public class DaemonConnector {
LOGGER.debug("Starting daemon process: uid = {}, workingDir = {}, daemonArgs: {}", uid, workingDir, command); LOGGER.debug("Starting daemon process: uid = {}, workingDir = {}, daemonArgs: {}", uid, workingDir, command);
ProcessBuilder.Redirect redirect = ProcessBuilder.Redirect.appendTo(layout.daemonOutLog(uid).toFile()); ProcessBuilder.Redirect redirect = ProcessBuilder.Redirect.appendTo(layout.daemonOutLog(uid).toFile());
new ProcessBuilder() Process process = new ProcessBuilder()
.directory(workingDir.toFile()) .directory(workingDir.toFile())
.command(args) .command(args)
.redirectOutput(redirect) .redirectOutput(redirect)
.redirectError(redirect) .redirectError(redirect)
.start(); .start();
return uid; return process;
} catch (Exception e) { } catch (Exception e) {
throw new DaemonException.StartException( throw new DaemonException.StartException(
String.format("Error starting daemon: uid = %s, workingDir = %s, daemonArgs: %s", String.format("Error starting daemon: uid = %s, workingDir = %s, daemonArgs: %s",