diff options
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/AbstractProducer.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/AbstractProducer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/AbstractProducer.java index b0010037027..de00b119cd0 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/AbstractProducer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/AbstractProducer.java @@ -31,15 +31,16 @@ abstract class AbstractProducer implements ArtifactProducer { String prefixedOutput = output.contains("\n") ? "\n" + output : (output.isEmpty() ? "<no output>" : output); - String logMsg = logOutput - ? String.format("Executed command %s.\nExited with code %d and output: %s", cmdString, exitCode, prefixedOutput) - : String.format("Executed command %s.\nExited with code %d.", cmdString, exitCode); - ctx.log(log, logMsg); if (exitCode > 0) { String errorMsg = logOutput - ? String.format("Failed to execute %s: %s", cmdString, prefixedOutput) + ? String.format("Failed to execute %s (exited with code %d): %s", cmdString, exitCode, prefixedOutput) : String.format("Failed to execute %s (exited with code %d)", cmdString, exitCode); throw new IOException(errorMsg); + } else { + String logMsg = logOutput + ? String.format("Executed command %s. Exited with code %d and output: %s", cmdString, exitCode, prefixedOutput) + : String.format("Executed command %s. Exited with code %d.", cmdString, exitCode); + ctx.log(log, logMsg); } return result; } |