You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2008/05/16 16:02:57 UTC
svn commit: r657069 - in /incubator/qpid/trunk/qpid/python/commands:
qpid-config qpid-queue-stats qpid-route qpid-tool
Author: cctrieloff
Date: Fri May 16 07:02:57 2008
New Revision: 657069
URL: http://svn.apache.org/viewvc?rev=657069&view=rev
Log:
QPID-1067 by tross
Modified:
incubator/qpid/trunk/qpid/python/commands/qpid-config
incubator/qpid/trunk/qpid/python/commands/qpid-queue-stats
incubator/qpid/trunk/qpid/python/commands/qpid-route
incubator/qpid/trunk/qpid/python/commands/qpid-tool
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-config
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-config?rev=657069&r1=657068&r2=657069&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-config (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-config Fri May 16 07:02:57 2008
@@ -28,7 +28,7 @@
from qpid.management import managementClient
from qpid.managementdata import Broker
from qpid.peer import Closed
-from qpid.connection import Connection
+from qpid.connection import Connection, ConnectionFailed
from qpid.datatypes import uuid4
from qpid.util import connect
from time import sleep
@@ -72,7 +72,7 @@
print " --durable Queue is durable"
print " --file-count N (8) Number of files in queue's persistence journal"
print " --file-size N (24) File size in pages (64Kib/page)"
- print " --max-queue-size N Maximum in-memory queue size as bytes"
+ print " --max-queue-size N Maximum in-memory queue size as bytes"
print " --max-queue-count N Maximum in-memory queue size as a number of messages"
print
print "Add Exchange Options:"
@@ -100,11 +100,14 @@
self.mclient = managementClient (self.spec)
self.mchannel = self.mclient.addChannel (self.session)
except socket.error, e:
- print "Socket Error:", e
+ print "Socket Error %s - %s" % (e[0], e[1])
sys.exit (1)
except Closed, e:
- print "Connect Failed:", e
+ print "Connect Failed %d - %s" % (e[0], e[1])
sys.exit (1)
+ except ConnectionFailed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit(1)
def Disconnect (self):
self.mclient.removeChannel (self.mchannel)
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-queue-stats
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-queue-stats?rev=657069&r1=657068&r2=657069&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-queue-stats (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-queue-stats Fri May 16 07:02:57 2008
@@ -29,7 +29,7 @@
from qpid.management import managementClient
from qpid.managementdata import Broker
from qpid.peer import Closed
-from qpid.connection import Connection
+from qpid.connection import Connection, ConnectionFailed
from qpid.util import connect
from time import sleep
@@ -67,8 +67,14 @@
self.mclient = managementClient (self.spec, None, self.configCb, self.instCb)
self.mchannel = self.mclient.addChannel (self.conn.session(self.sessionId))
except socket.error, e:
- print "Connect Error:", e
- exit (1)
+ print "Socket Error %s - %s" % (e[0], e[1])
+ sys.exit (1)
+ except Closed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit (1)
+ except ConnectionFailed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit(1)
def setFilter(self,filter):
self.filter = filter
@@ -143,7 +149,7 @@
def main():
p = optparse.OptionParser()
p.add_option('--broker-address','-a', default='localhost' , help='broker-addr is in the form: [username/password@] hostname | ip-address [:<port>] \n ex: localhost, 10.1.1.7:10000, broker-host:10000, guest/guest@localhost')
- p.add_option('--amqp-spec-file','-s', default='"/usr/share/amqp/amqp.0-10.xml', help='the path to the amqp spec file')
+ p.add_option('--amqp-spec-file','-s', default='/usr/share/amqp/amqp.0-10.xml', help='the path to the amqp spec file')
p.add_option('--filter','-f' ,default=None ,help='a list of comma separated queue names (regex are accepted) to show')
options, arguments = p.parse_args()
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-route
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-route?rev=657069&r1=657068&r2=657069&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-route (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-route Fri May 16 07:02:57 2008
@@ -27,7 +27,7 @@
from qpid.management import managementClient
from qpid.managementdata import Broker
from qpid.peer import Closed
-from qpid.connection import Connection
+from qpid.connection import Connection, ConnectionFailed
from qpid.util import connect
def Usage ():
@@ -70,14 +70,21 @@
try:
self.spec = qpid.spec.load (_specpath)
self.sessionId = "%s.%d" % (os.uname()[1], os.getpid())
- self.conn = Connection (connect (broker.host, broker.port), self.spec, username=broker.username, password=broker.password)
+ self.conn = Connection (connect (broker.host, broker.port), self.spec, \
+ username=broker.username, password=broker.password)
self.conn.start ()
self.mclient = managementClient (self.spec)
self.mch = self.mclient.addChannel (self.conn.session(self.sessionId))
self.mclient.syncWaitForStable (self.mch)
except socket.error, e:
- print "Connect Error:", e
+ print "Socket Error %s - %s" % (e[0], e[1])
sys.exit (1)
+ except Closed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit (1)
+ except ConnectionFailed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit(1)
def Disconnect (self):
self.mclient.removeChannel (self.mch)
Modified: incubator/qpid/trunk/qpid/python/commands/qpid-tool
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-tool?rev=657069&r1=657068&r2=657069&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/commands/qpid-tool (original)
+++ incubator/qpid/trunk/qpid/python/commands/qpid-tool Fri May 16 07:02:57 2008
@@ -24,6 +24,7 @@
import sys
import socket
from cmd import Cmd
+from qpid.connection import ConnectionFailed
from qpid.managementdata import ManagementData
from shlex import split
from qpid.disp import Display
@@ -183,6 +184,9 @@
except IOError, e:
print "IOError: %d - %s: %s" % (e.errno, e.strerror, e.filename)
sys.exit (1)
+except ConnectionFailed, e:
+ print "Connect Failed %d - %s" % (e[0], e[1])
+ sys.exit(1)
# Instantiate the CLI interpreter and launch it.
cli = Mcli (data, disp)