Merge branch 'threaded_monitor' of github.com:quantopian/zipline into threaded_monitor

tests/test_transforms.py

@@ -2,6 +2,8 @@ from datetime import timedelta
 from collections import defaultdict
 from unittest2 import TestCase
 
+from logbook.compat import LoggingHandler
+
 import zipline.utils.factory as factory
 from zipline.finance.vwap import DailyVWAP, VWAPTransform
 from zipline.finance.returns import ReturnsFromPriorClose
@@ -22,6 +24,11 @@ class ZiplineWithTransformsTestCase(TestCase):
             'allocator':allocator,
             'sid':133
         }
+        self.log_handler = LoggingHandler()
+        self.log_handler.push_application()
+
+    def tearDown(self):
+        self.log_handler.pop_application()
 
     def test_vwap_tnfm(self):
         zipline = SimulatedTrading.create_test_zipline(

zipline/core/component.py

@@ -40,11 +40,6 @@ class Component(object):
     :param addresses: a dict of name_string -> zmq port address strings.
                       Must have the following entries
 
-    :param sync_address: socket address used for synchronizing the start of
-                         all workers, heartbeating, and exit notification
-                         will be used in REP/REQ sockets. Bind is always on
-                         the REP side.
-
     :param data_address: socket address used for data sources to stream
                          their records. Will be used in PUSH/PULL sockets
                          between data sources and a Feed. Bind will always
@@ -430,7 +425,6 @@ class Component(object):
         )
         self.control_out.send(done_frame)
 
-        self.receive_sync_ack()
         #notify internal work look that we're done
         self.done = True # TODO: use state flag
 
@@ -450,19 +444,6 @@ class Component(object):
         # ZeroMQ. Either zmq.Poller or gpoll.Poller .
         self.poll = self.zmq_poller()
 
-    def receive_sync_ack(self):
-        """
-        Wait for synchronization reply from the host.
-
-        DEPRECATED, left in for compatability for now.
-        """
-
-        socks = dict(self.sync_poller.poll(self.heartbeat_timeout))
-        if self.sync_socket in socks and socks[self.sync_socket] == self.zmq.POLLIN:
-            message = self.sync_socket.recv()
-        #else:
-            #raise Exception("Sync ack timed out on response for {id}".format(id=self.get_id))
-
     def bind_data(self):
         return self.bind_pull_socket(self.addresses['data_address'])