Merge pull request saltstack#234 from markusgattol/0dd4cb0e13

use ROUTER/DEALER
valentinbud · Nov 14, 2011 · b95d8b4 · b95d8b4
2 parents 56494e8 + 0dd4cb0
commit b95d8b4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/salt/master.py b/salt/master.py
@@ -171,10 +171,8 @@ def __init__(self, opts, crypticle, key, mkey, aes_funcs, clear_funcs):
         self.context = zmq.Context(self.opts['worker_threads'])
         # Prepare the zeromq sockets
         self.uri = 'tcp://%(interface)s:%(ret_port)s' % self.opts
-        # FIXME: both, XREP and XREQ are deprecated in favor of ROUTER
-        # and DEALER
-        self.clients = self.context.socket(zmq.XREP)
-        self.workers = self.context.socket(zmq.XREQ)
+        self.clients = self.context.socket(zmq.ROUTER)
+        self.workers = self.context.socket(zmq.DEALER)
         self.w_uri = 'ipc://{0}'.format(
             os.path.join(self.opts['sock_dir'], 'workers.ipc')
             )