X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fpostoffice.py;h=a84158b1a57af60ce02dfdbd287a45b5ad749c7f;hp=675f9bffa7c9e8e14e1f2bc34fb885bfc966ddf1;hb=ae451be237b4622abd934a611f5e2dd4d8aec883;hpb=44b759cfcfb80d94ddac5ea11302a6f94cb307b4

diff --git a/jamaui/postoffice.py b/jamaui/postoffice.py
index 675f9bf..a84158b 100644
--- a/jamaui/postoffice.py
+++ b/jamaui/postoffice.py
@@ -23,38 +23,45 @@
 #
 # message central
 
+from __future__ import with_statement
 import logging
+import threading
 
 log = logging.getLogger(__name__)
 
 class PostOffice(object):
 
     def __init__(self):
+        self.lock = threading.RLock()
         self.tags = {} # tag -> [callback]
 
     def notify(self, tag, *data):
-        clients = self.tags.get(tag)
-        if clients:
-            log.debug("(%s %s) -> [%s]",
-                      tag,
-                      " ".join(str(x) for x in data),
-                      " ".join(str(x) for x in clients))
-            for client in clients:
-                client(*data)
-
-    def connect(self, tag, callback):
-        if tag not in self.tags:
-            self.tags[tag] = []
-        clients = self.tags[tag]
-        if callback not in clients:
-            clients.append(callback)
-
-    def disconnect(self, tag, callback):
-        if tag not in self.tags:
-            self.tags[tag] = []
-        clients = self.tags[tag]
-        if callback in clients:
-            clients.remove(callback)
+        with self.lock:
+            log.info("(%s %s)", tag, " ".join(str(x) for x in data))
+            clients = self.tags.get(tag)
+            if clients:
+                for ref, client in clients:
+                    client(*data)
+
+    def connect(self, tag, ref, callback):
+        with self.lock:
+            if not isinstance(tag, list):
+                tag = [tag]
+            for t in tag:
+                if t not in self.tags:
+                    self.tags[t] = []
+                clients = self.tags[t]
+                if callback not in clients:
+                    clients.append((ref, callback))
+
+    def disconnect(self, tag, ref):
+        with self.lock:
+            if not isinstance(tag, list):
+                tag = [tag]
+            for t in tag:
+                if t not in self.tags:
+                    self.tags[t] = []
+                self.tags[t] = [(_ref, cb) for _ref, cb in self.tags[t] if _ref != ref]
 
 postoffice = PostOffice()