xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.

Browse source 
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 132ac21917 [formerly e0525f7816] [formerly 132ac21917 [formerly e0525f7816] [formerly 3686a36ae7 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]
Former-commit-id: 3686a36ae7
Former-commit-id: bf66116b50 [formerly 66e3669532]
Former-commit-id: 40087c34e4
This commit is contained in:
David Lovely 2014-11-13 10:59:00 -06:00
parent a25ce72cec
commit bcb7dbce05
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pythonPackages/qpid/bin/qpid-queue-count
View file

@ -75,7 +75,7 @@ class RestManager():
httpConn.timeout = _connTimeout httpConn.timeout = _connTimeout
httpConn.connect() httpConn.connect()
httpConn.request("GET", "/rest/" + service) httpConn.request("GET", "/api/v2/" + service)
response = httpConn.getresponse() response = httpConn.getresponse()
if (response.status != 200): if (response.status != 200):

4
pythonPackages/qpid/bin/qpid-stat
View file

@ -250,7 +250,7 @@ class RestManager():
httpConn.timeout = _connTimeout httpConn.timeout = _connTimeout
httpConn.connect() httpConn.connect()
httpConn.request("GET", "/rest/" + service) httpConn.request("GET", "/api/v2/" + service)
response = httpConn.getresponse() response = httpConn.getresponse()
if (response.status != 200): if (response.status != 200):
@ -352,4 +352,4 @@ except KeyboardInterrupt:
print print
except Exception,e: except Exception,e:
print "Failed: %s - %s" % (e.__class__.__name__, e) print "Failed: %s - %s" % (e.__class__.__name__, e)
sys.exit(1) sys.exit(1)

10
rpms/build/common/rpms.sh
View file

@ -77,7 +77,7 @@ function buildQPID()
return 1 return 1
fi fi
# Copy the 0.28 qpid rpms # Copy the 0.30 qpid rpms
cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/noarch cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/noarch
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: Failed to build Qpid v0.30." echo "ERROR: Failed to build Qpid v0.30."
@ -101,7 +101,15 @@ function buildQPID()
#build 0.30 #build 0.30
export AWIPS_II_TOP_DIR export AWIPS_II_TOP_DIR
cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30 cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build Qpid Broker v0.30."
return 1
fi
/bin/bash build.sh /bin/bash build.sh
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build Qpid Broker v0.30."
return 1
fi
popd > /dev/null 2>&1 popd > /dev/null 2>&1