intersticial for merge with @ssanderson's latest

This commit is contained in:
fawce
2012-08-01 11:19:59 -04:00
parent e4a21e7c61
commit fe8a443051
+9 -4
View File
@@ -1,4 +1,3 @@
import inspect
import os
import zmq
import sys
@@ -69,7 +68,12 @@ class Controller(object):
debug = True
period = PARAMETERS.GENERATIONAL_PERIOD
def __init__(self, pub_socket, route_socket, send_sighup=False):
def __init__(
self,
pub_socket,
route_socket,
exception_socket,
send_sighup=False):
self.nosignals = False
self.context = None
@@ -90,8 +94,9 @@ class Controller(object):
self.associated = []
self.pub_socket = pub_socket
self.route_socket = route_socket
self.pub_socket = pub_socket
self.route_socket = route_socket
self.exception_socket = exception_socket
self.error_replay = OrderedDict()