From 64e825feb5f59898e45bac918179d4e2bf0404f3 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 12 Apr 2016 14:06:17 +0000
Subject: [PATCH] Task #8887: More minor bugfixes
---
SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py | 3 ++-
SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
index c71107c7313..04d76ae733e 100755
--- a/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
+++ b/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
@@ -27,6 +27,7 @@ if __name__ == '__main__':
if (options.broker==None):
parser.print_help()
+ sys.exit(1)
else:
QPIDinfra.addhost(options.broker)
@@ -49,7 +50,7 @@ if __name__ == '__main__':
exchange=options.exchange
QPIDinfra.bindqueuetohost(options.queue,options.federation)
- QPIDinfra.setqueueroute(options.queue,options.broker,options.federation,exchange)
+ QPIDinfra.setqueueroute(options.queue,options.broker,options.federation,options.exchange)
else:
if (options.exchange):
QPIDinfra.addexchange(options.exchange) # should be superfluous
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py b/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
index a43ef5c204d..87019b014f5 100755
--- a/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
+++ b/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
@@ -225,7 +225,7 @@ class qpidinfra:
If dynamic is set to True the routing key won't have any effect since teh routing is assumed dynamic.
"""
if (self.getexchangeroute(exchangeid,routingkey,fromid,toid)==0):
- self.db.docommit("insert into exchangeroutes (eid,fromhost,tohost,routingkey,dynamic);" %(exchangeid,fromid,toid,routingkey,dynamic))
+ self.db.docommit("insert into exchangeroutes (eid,fromhost,tohost,routingkey,dynamic) values (%s, %s, %s, '%s', %s);" %(exchangeid,fromid,toid,routingkey,dynamic))
def delexchangeroute(self,exchangeid,routingkey,fromid,toid,dynamic=False):
""" Delete the exchange route for exchangeid,routingkey,fromid,toid and dynamic(bool).
--
GitLab