apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix update_config.py use of subprocess.

Browse Source
This commit is contained in:
Leo Simons 2014-08-07 14:46:45 +02:00 committed by wilderrodrigues
parent 5f87bde909
commit cf4cdde291
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
systemvm/patches/debian/config/opt/cloud/bin/update_config.py
View File

@ -4,7 +4,7 @@ import sys
from merge import loadQueueFile from merge import loadQueueFile
import logging import logging
import subprocess import subprocess
from subprocess import PIPE from subprocess import PIPE, STDOUT
logging.basicConfig(filename='/var/log/cloud.log',level=logging.DEBUG, format='%(asctime)s %(message)s') logging.basicConfig(filename='/var/log/cloud.log',level=logging.DEBUG, format='%(asctime)s %(message)s')
@ -19,12 +19,12 @@ qf.load(None)
# Converge # Converge
run = subprocess.Popen(["/opt/cloud/bin/configure.py"], run = subprocess.Popen(["/opt/cloud/bin/configure.py"],
stdout=PIPE, stderr=PIPE) stdout=PIPE, stderr=STDOUT)
result = run.wait() stdout, stderr = run.communicate()
if (result != 0): if run.returncode:
print run.stderr print stdout
else: else:
print "Convergence is achieved - you have been assimilated!" print "Convergence is achieved - you have been assimilated!"
sys.exit(result) sys.exit(run.returncode)