Repository: storm Updated Branches: refs/heads/master 38fb8cce0 -> e38f93607
STORM-2641: Make storm.py print output from subprocess on error on Windows, make storm.ps1 return the right exit code Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/32b46ff8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/32b46ff8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/32b46ff8 Branch: refs/heads/master Commit: 32b46ff887f0c92c0712f81b600ac1df73ae8eef Parents: 6a647cb Author: Stig Rohde Døssing <s...@apache.org> Authored: Wed Jul 19 15:06:52 2017 +0200 Committer: Stig Rohde Døssing <s...@apache.org> Committed: Wed Jul 19 15:06:52 2017 +0200 ---------------------------------------------------------------------- bin/storm.ps1 | 4 +++- bin/storm.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/32b46ff8/bin/storm.ps1 ---------------------------------------------------------------------- diff --git a/bin/storm.ps1 b/bin/storm.ps1 index 112ff5e..7804251 100644 --- a/bin/storm.ps1 +++ b/bin/storm.ps1 @@ -63,4 +63,6 @@ if(Test-Path $StormEnvPath) { . $StormEnvPath; } -& ([io.path]::combine("$STORM_BIN_DIR", "storm.py")) $args; \ No newline at end of file +& ([io.path]::combine("$STORM_BIN_DIR", "storm.py")) $args; + +exit $LastExitCode \ No newline at end of file http://git-wip-us.apache.org/repos/asf/storm/blob/32b46ff8/bin/storm.py ---------------------------------------------------------------------- diff --git a/bin/storm.py b/bin/storm.py index 8f7a635..33c0a1e 100755 --- a/bin/storm.py +++ b/bin/storm.py @@ -291,6 +291,7 @@ def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[] ret = sub.check_output(all_args, stderr=sub.STDOUT) print(ret) except sub.CalledProcessError as e: + print(e.output) sys.exit(e.returncode) else: os.execvp(JAVA_CMD, all_args)
