[rhmessaging-commits] rhmessaging commits: r1704 - mgmt/mint/bin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-02-18 17:15:06 -0500 (Mon, 18 Feb 2008)
New Revision: 1704

Modified:
   mgmt/mint/bin/mint-test
Log:
Updates mint-test to use the new connection api.



Modified: mgmt/mint/bin/mint-test
===================================================================
--- mgmt/mint/bin/mint-test	2008-02-18 21:26:00 UTC (rev 1703)
+++ mgmt/mint/bin/mint-test	2008-02-18 22:15:06 UTC (rev 1704)
@@ -1,42 +1,38 @@
 #!/usr/bin/env python
 
 import sys
+from qpid.management import ManagedBroker
+from time import sleep
 
+from mint import *
+
 def usage():
     print "Usage: mint-test DATABASE-URI BROKER-ADDRESS"
-    print "Example: mint-test postgresql://who@where/dbname example.com:10001"
+    print "Example: mint-test postgresql://cumin@postgresql/cumin localhost:5672"
     sys.exit(1)
 
-from sqlobject import *
+def do_main(uri, host, port):
+    model = MintModel(uri)
+    model.init()
 
-try:
-    connuri = sys.argv[1]
-    conn = connectionForURI(connuri)
-    sqlhub.processConnection = conn
-except IndexError:
-    usage()
+    conn = BrokerConnection(model, host, port)
+    conn.open()
 
-from qpid.management import ManagedBroker
-from time import sleep
+    try:
+        while (True):
+            sleep(5)
+    finally:
+        conn.close()
 
-from mint import *
-
-def do_main(dburi, brokerhost, brokerport):
-    model = MintModel()
-    model.addManagedBroker(brokerhost, brokerport)
-
-    while (True):
-        sleep(5)
-
 def main():
     if len(sys.argv) != 3:
         usage()
 
-    dburi, brokeraddr = sys.argv[1:]
-    brokerhost, brokerport = brokeraddr.split(":")
+    uri, addr = sys.argv[1:]
+    host, port = addr.split(":")
 
     try:
-        do_main(dburi, brokerhost, int(brokerport))
+        do_main(uri, host, int(port))
     except KeyboardInterrupt:
         pass