Make sending the output of the dist command configurable

This commit is contained in:
Mark Veidemanis 2017-12-03 19:23:29 +00:00
parent e2682615ae
commit 96dd71bbdd
3 changed files with 6 additions and 1 deletions

1
.gitignore vendored
View File

@ -3,4 +3,5 @@
*.pem *.pem
config.json config.json
pool.json pool.json
dist.sh
env/ env/

View File

@ -8,6 +8,7 @@
"ConnectOnCreate": false, "ConnectOnCreate": false,
"HighlightNotifications": true, "HighlightNotifications": true,
"DistEnabled": true, "DistEnabled": true,
"SendDistOutput": false,
"Password": "s", "Password": "s",
"Default": { "Default": {
"password": null, "password": null,

View File

@ -471,7 +471,10 @@ class Helper(object):
elif cmd == "dist": elif cmd == "dist":
if config["DistEnabled"]: if config["DistEnabled"]:
rtrn = run(["./dist.sh"], shell=True, stdout=PIPE) rtrn = run(["./dist.sh"], shell=True, stdout=PIPE)
if config["SendDistOutput"]:
info("Exit code: %s -- Stdout: %s" % (rtrn.returncode, rtrn.stdout)) info("Exit code: %s -- Stdout: %s" % (rtrn.returncode, rtrn.stdout))
else:
info("Exit code: %s" % rtrn.returncode)
else: else:
failure("The dist command is not enabled") failure("The dist command is not enabled")
return return