QPID-1484 - qpid-printevents now handles connection loss/reconnect

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@720276 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 4 deletions

diff --git a/qpid/python/commands/qpid-printevents b/qpid/python/commands/qpid-printevents
index f27eec04f1..0c1b618a1f 100755
--- a/qpid/python/commands/qpid-printevents
+++ b/qpid/python/commands/qpid-printevents
@@ -23,13 +23,20 @@ import os
 import optparse
 import sys
 import socket
-import time
+from time import time, strftime, gmtime, sleep
 from qmf.console import Console, Session
 
 class EventConsole(Console):
   def event(self, broker, event):
     print event
 
+  def brokerConnected(self, broker):
+    print strftime("%c", gmtime(time())), "NOTIC qpid-printevents:brokerConnected broker=%s" % broker.getUrl()
+
+  def brokerDisconnected(self, broker):
+    print strftime("%c", gmtime(time())), "NOTIC qpid-printevents:brokerDisconnected broker=%s" % broker.getUrl()
+
+
 ##
 ## Main Program
 ##
@@ -48,14 +55,17 @@ ex: localhost, 10.1.1.7:10000, broker-host:10000, guest/guest@localhost
     arguments.append("localhost")
 
   console = EventConsole()
-  session = Session(console, rcvObjects=False, rcvHeartbeats=False)
+  session = Session(console, rcvObjects=False, rcvHeartbeats=False, manageConnections=True)
+  brokers = []
   for host in arguments:
-    session.addBroker(host)
+    brokers.append(session.addBroker(host))
 
   try:
     while (True):
-      time.sleep(10)
+      sleep(10)
   except KeyboardInterrupt:
+    for broker in brokers:
+      session.delBroker(broker)
     print
     sys.exit(0)