[Checkins] SVN: zc.zeoinputlog/branches/replay/s

[Jim Fulton]

Log message for revision 105424:
  

Changed:
  U   zc.zeoinputlog/branches/replay/setup.py
  U   zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py

-=-
Modified: zc.zeoinputlog/branches/replay/setup.py
===================================================================
--- zc.zeoinputlog/branches/replay/setup.py	2009-11-01 19:36:58 UTC (rev 105423)
+++ zc.zeoinputlog/branches/replay/setup.py	2009-11-01 21:29:48 UTC (rev 105424)
@@ -21,6 +21,8 @@
 extras_require = dict(test=['zope.testing'])
 
 entry_points = """
+[console_scripts]
+replay = zc.zeoinputlog.replay:main
 """
 
 from setuptools import setup

Modified: zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py
===================================================================
--- zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py	2009-11-01 19:36:58 UTC (rev 105423)
+++ zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/replay.py	2009-11-01 21:29:48 UTC (rev 105424)
@@ -280,6 +280,7 @@
         self.queue = []
         self.messages = {}
         self.times = handlers.times
+        self.active = handlers.active
         self.errtimes = handlers.errtimes
         self.lock = threading.Lock()
         zc.ngi.async.connect(addr, self)
@@ -342,6 +343,7 @@
             #    (v[0], v[2]) for v in self.messages.values()
             #    ], elapsed
             self.handlers.replies += 1
+            self.active.remove(self.session)
             if (isinstance(ret, tuple)
                 and len(ret) == 2
                 and isinstance(ret[1], Exception)
@@ -376,6 +378,7 @@
                 #    (v[0], v[2]) for v in self.messages.values()]
                 self.messages[self.msgid] = op, args, time.time()
                 self.queueing = True
+                self.active.add(self.session)
 
             self.connection.write(cPickle.dumps((self.msgid, async, op, args)))
 
@@ -389,6 +392,7 @@
     def __init__(self):
         self.errtimes = {}
         self.times = {}
+        self.active = set()
 
 def parse_addr(addr):
     addr = addr.split(':')
@@ -485,9 +489,10 @@
         lastnow = now
         lasttt = tt
         work = nt + nr + handlers.calls + handlers.async
-        print '=== top', time.ctime(), nt, ZODB.TimeStamp.TimeStamp(
-            time_stamp(tt))
-        print '       ', handlers.connected, handlers.calls, handlers.replies,
+        print nt, time.strftime('%H:%M:%S', time.localtime(time.time())),
+        print ZODB.TimeStamp.TimeStamp(time_stamp(tt)),
+        print handlers.connected, len(handlers.active), handlers.calls,
+        print handlers.replies,
         print handlers.errors, handlers.async, pending, speed, speed1
         while logrecord[1] < tt:
             ni += 1