Changeset 39

Timestamp:

02/07/08 06:13:01 (11 months ago)

Author:

mike

Message:

Made code a bit prettier

Files:

• cometd.py (modified) (2 diffs)
• tabled.py (modified) (1 diff)

cometd.py

@@ -337 +337 @@
                 self.connection = conn
 
-        def messageReceived(self, message):
-                print "MESSAGE RECEIVED"
-                self.sendMessage(message)
+        def messageReceived(self, message, channel):
+                self.sendMessage(message,channel)
                 pass
 
-        def sendMessage(self, message):
+        def sendMessage(self, message, channel):
                 if self.connection is not None:
-                        print "Sending ---- Delivering"
-                        self.connection.deliver(message)
+                        self.connection.deliver({"data":message, "channel":channel})
                 else:
                         #FIXME make own exception
@@ -726 +724 @@
                         success["id"] = message["id"]
                 
-                print "MOOMOOMESSAGE: %s " % message
                 client = self.clients[message["clientId"]]
-                client.messageReceived(message)
+                client.messageReceived(message["data"],message["channel"])
                 return success
                 # FIXME: aggregate ACKs!

tabled.py

@@ -92 +92 @@
         BasePokerTableHandler.__init__(self)
 
-    def messageReceived(self,message):
-        print "########### Hey we recieved a message %s" % message
-        self.dataReceived(message["data"])
+    def messageReceived(self,message,channel):
+        self.dataReceived(message)
 
     def sendMessageViaTransport(self,data):
-        print "##########3Sending Message %s"  % data
-        cometd.Client.sendMessage(self,{"data":data,"channel":"/poker"})
+        cometd.Client.sendMessage(self,data,"/poker")