Merge pull request #93 from Cgettys/master

Fixed README.md to match the code in examples/chat.py
zeromq · Jun 16, 2016 · 4db359a · 4db359a
2 parents 9b17386 + 0601d59
commit 4db359a
Showing 1 changed file with 74 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -101,75 +101,82 @@ For now use Pip:
 ## Example Chat Client
 
 ```python
-    from pyre import Pyre
-    from pyre import zhelper
-    import zmq
-    import uuid
-    import json
-
-
-    def chat_task(ctx, pipe):
-        n = Pyre("CHAT")
-        n.set_header("CHAT_Header1","example header1")
-	n.set_header("CHAT_Header2","example header2")
-        n.join("CHAT")
-        n.start()
-
-        poller = zmq.Poller()
-        poller.register(pipe, zmq.POLLIN)
-        poller.register(n.inbox, zmq.POLLIN)
-
-        while(True):
-            items = dict(poller.poll())
-
-            if pipe in items and items[pipe] == zmq.POLLIN:
-                message = pipe.recv()
-
-                # message to quit
-                if message.decode('utf-8') == "$$STOP":
-                    break
-
-                print("CHAT_TASK: {0}".format(message))
-
-                n.shout("CHAT", message)
-
-            if n.inbox in items and items[n.inbox] == zmq.POLLIN:
-                cmds = n.recv()
-                msg_type = cmds.pop(0)
-
-                peer_uuid_bytes = cmds.pop(0)
-                peer_uuid = uuid.UUID(bytes=peer_uuid_bytes)
-
-                print("NODE_MSG TYPE: {0}".format(msg_type))
-                print("NODE_MSG PEER: {0}".format(peer_uuid))
-
-                if type.decode('utf-8') == "SHOUT":
-                    group_name = cmds.pop(0)
-                    print("NODE_MSG GROUP: {0}".format(group_name))
-                elif msg_type.decode('utf-8') == "ENTER":
-		    headers = json.loads(cmds.pop(0))
-		    print("NODE_MSG HEADERS: {0}".format(headers))
-                print("NODE_MSG CONT: {0}".format(cmds))
-
-        n.stop()
-    # end chat_task
-
-
-    if __name__ == '__main__':
-        ctx = zmq.Context()
-        chat_pipe = zhelper.zthread_fork(ctx, chat_task)
-
-        while True:
-            try:
-                msg = input()
-                chat_pipe.send(msg.encode('utf_8'))
-
-            except (KeyboardInterrupt, SystemExit):
+try:
+    from zyre_pyzmq import Zyre as Pyre
+except Exception as e:
+    print("using Python native module", e)
+    from pyre import Pyre 
+
+from pyre import zhelper 
+import zmq 
+import uuid
+import logging
+import sys
+import json
+
+def chat_task(ctx, pipe):
+    n = Pyre("CHAT")
+    n.set_header("CHAT_Header1","example header1")
+    n.set_header("CHAT_Header2","example header2")
+    n.join("CHAT")
+    n.start()
+
+    poller = zmq.Poller()
+    poller.register(pipe, zmq.POLLIN)
+    print(n.socket())
+    poller.register(n.socket(), zmq.POLLIN)
+    print(n.socket())
+    while(True):
+        items = dict(poller.poll())
+        print(n.socket(), items)
+        if pipe in items and items[pipe] == zmq.POLLIN:
+            message = pipe.recv()
+            # message to quit
+            if message.decode('utf-8') == "$$STOP":
                 break
+            print("CHAT_TASK: %s" % message)
+            n.shouts("CHAT", message.decode('utf-8'))
+        else:
+        #if n.socket() in items and items[n.socket()] == zmq.POLLIN:
+            print("HMMM")
+            cmds = n.recv()
+            print("HMMM",cmds)
+            msg_type = cmds.pop(0)
+            print("NODE_MSG TYPE: %s" % msg_type)
+            print("NODE_MSG PEER: %s" % uuid.UUID(bytes=cmds.pop(0)))
+            print("NODE_MSG NAME: %s" % cmds.pop(0))
+            if msg_type.decode('utf-8') == "SHOUT":
+                print("NODE_MSG GROUP: %s" % cmds.pop(0))
+            elif msg_type.decode('utf-8') == "ENTER":
+                headers = json.loads(cmds.pop(0).decode('utf-8'))
+                print("NODE_MSG HEADERS: %s" % headers)
+                for key in headers:
+                    print("key = {0}, value = {1}".format(key, headers[key]))
+            print("NODE_MSG CONT: %s" % cmds)
+    n.stop()
+
+
+if __name__ == '__main__':
+    # Create a StreamHandler for debugging
+    logger = logging.getLogger("pyre")
+    logger.setLevel(logging.INFO)
+    logger.addHandler(logging.StreamHandler())
+    logger.propagate = False
 
-        chat_pipe.send("$$STOP".encode('utf_8'))
-
-        print("FINISHED")
+    ctx = zmq.Context()
+    chat_pipe = zhelper.zthread_fork(ctx, chat_task)
+    # input in python 2 is different
+    if sys.version_info.major < 3:
+        input = raw_input
+
+    while True:
+        try:
+            msg = input()
+            chat_pipe.send(msg.encode('utf_8'))
+        except (KeyboardInterrupt, SystemExit):
+            break
+    chat_pipe.send("$$STOP".encode('utf_8'))
+    print("FINISHED")
 ```
 
 Look at the [ZOCP](https://github.com/z25/pyZOCP) project for examples of how Pyre can be