From 2deb6ba254b5590c7a38c98bcfa4cf7a6acd2372 Mon Sep 17 00:00:00 2001
From: Stephen Diehl <stephen.m.diehl@gmail.com>
Date: Fri, 24 Feb 2012 20:06:12 -0500
Subject: [PATCH] Register control socket in every component.

---
 zipline/component.py |  6 ++++++
 zipline/monitor.py   | 39 ++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/zipline/component.py b/zipline/component.py
index 4620e1d8..3ffdc755 100644
--- a/zipline/component.py
+++ b/zipline/component.py
@@ -233,6 +233,12 @@ class Component(object):
         """
         assert self.controller
 
+        self.control_out = self.controller.message_sender()
+        self.control_in = self.controller.message_listener()
+
+        self.poll.register(self.control_in, self.zmq.POLLIN)
+        self.sockets.extend([self.control_in, self.control_out])
+
     def setup_sync(self):
         qutil.LOGGER.debug("Connecting sync client for {id}".format(id=self.get_id))
 
diff --git a/zipline/monitor.py b/zipline/monitor.py
index 1e43ba6e..450fc444 100644
--- a/zipline/monitor.py
+++ b/zipline/monitor.py
@@ -10,6 +10,7 @@ class Controller(object):
 
     def __init__(self, pull_socket, pub_socket, context=None, logging = None):
 
+        self.associated = []
 
         if not context:
             self._ctx = zmq.Context()
@@ -19,11 +20,6 @@ class Controller(object):
         self.pull_socket = pull_socket
         self.pub_socket = pub_socket
 
-        self.pull = self._ctx.socket(zmq.PULL)
-        self.pub = self._ctx.socket(zmq.PUB)
-
-        self.associated = [self.pull, self.pub]
-
         if logging:
             self.logging = logging
             self.dologging = True
@@ -34,23 +30,13 @@ class Controller(object):
         self.success = 0
         self.failed = 0
 
-        try:
-            self.pull.bind(pull_socket)
-        except zmq.ZMQError:
-            raise Exception('Cannot not bind on %s' % pull_socket)
-
-        try:
-            self.pub.bind(pub_socket)
-        except zmq.ZMQError:
-            raise Exception('Cannot not bind on %s' % pub_socket)
-
     def run(self, debug=False):
         self.polling = True
 
-        if debug:
-            return self._poll(False)
-        else:
-            return self._poll_fast()
+        #if debug:
+        return self._poll()
+        #else:
+            #return self._poll_fast()
 
     def _poll_fast(self):
         """
@@ -64,11 +50,17 @@ class Controller(object):
         mostly used for debugging.
         """
 
+        self.pull = self._ctx.socket(zmq.PULL)
+        self.pub = self._ctx.socket(zmq.PUB)
+
+        self.associated.extend([self.pull, self.pub])
+
+        self.pull.bind(self.pull_socket)
+        self.pub.bind(self.pub_socket)
+
         while self.polling:
             try:
-                self.logging.info('msg')
                 self.pub.send(self.pull.recv())
-                #self.pub.send(self.pull.recv(copy=False))
             except KeyboardInterrupt:
                 self.polling = False
                 break
@@ -78,7 +70,8 @@ class Controller(object):
             except Exception as e:
                 # Its common to wrap these in wildcard exceptions so
                 # that we don't loose messages, ever
-                self.logging.error(str(e))
+                if self.logging:
+                    self.logging.error(str(e))
                 self.failed += 1
                 continue
 
@@ -89,7 +82,6 @@ class Controller(object):
         """
         s = self._ctx.socket(zmq.PUSH)
         s.connect(self.pull_socket)
-        s.setsockopt(zmq.LINGER, -1)
         self.associated.append(s)
         return s
 
@@ -103,6 +95,7 @@ class Controller(object):
         s.setsockopt(zmq.SUBSCRIBE, '')
         self.associated.append(s)
         return s
+
     def destroy(self):
         """
         Manual cleanup.