Kolab Groupware OBS

Changes of Revision 36

bonnie.spec Changed

bonnie-0.2.0.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py -> bonnie-0.2.1.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py Changed

@@ -195,9 +195,7 @@
                 pending=%(jwp)d, alloc=%(jwa)d.
     Collectors: ready=%(cr)d, busy=%(cb)d, stale=%(cs)d,
                 pending=%(jcp)d, alloc=%(jca)d.
-    Took:       seconds=%(duration)s.""" % stats
-
-                log.info(info)
+    Took:       seconds=%(duration)s.""" % stats)
 
                 last_state = time.time()
 
@@ -353,13 +351,13 @@
     def _handle_wcr_PUSHBACK(self, router, identity, message):
         log.debug("Handing PUSHBACK for identity %s (message: %r)" % (identity, message), level=8)
         job_uuid = message[0]
-        job_ = job.select(job_uuid)
+        _job = job.select(job_uuid)
 
-        if job_ is not None and job_.pushbacks < 5:
+        if _job is not None and _job.pushbacks < 5:
             job.update(
                     job_uuid,
                     state = b'PENDING',
-                    pushbacks = job_.pushbacks + 1
+                    pushbacks = _job.pushbacks + 1
                 )
         else:
             log.error("Job %s pushed back too many times" % (job_uuid))