Merge branch '1.2' into develop

fedora-infra · Apr 27, 2017 · a11ac4a · a11ac4a
2 parents 4859968 + 79d2716
commit a11ac4a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fmn/consumer/backend.py b/fmn/consumer/backend.py
@@ -206,11 +206,11 @@ def read(queue_object):
     for recipient in recipients:
         user = recipient['user']
         t = time.time()
-        pref = PREFS.get('%s__%s' % (user, context))
+        pref = PREFS.get('%s_%s' % (user, context))
         print("pref retrieved in: %0.2fs" % (time.time() - t))
 
         try:
-            if not pref.should_batch:
+            if pref.get('batch_delta') is None and pref.get('batch_count') is None:
                 print("    Calling backend %r with %r" % (backend, recipient))
                 t = time.time()
                 backend.handle(session, recipient, raw_msg)