saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bring back inheritence, since I am fool and I did that right the first time

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-03 15:28:45 -07:00
parent 012bffb1d3
commit 3f7db8344f
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
salt/master.py
View file

@ -119,7 +119,7 @@ class ReqServer(threading.Thread):
self.__bind()
class LocalServer(threading.Thread):
class LocalServer(ReqServer):
'''
Create the localhost communication interface for root clients to connect
to
@ -133,7 +133,7 @@ class LocalServer(threading.Thread):
self.publisher = Publisher(opts)
self.publisher.start()
# Create clients socket
self.c_uri = 'tcp://localhost:' + self.opts['local_port']
self.c_uri = 'tcp://127.0.0.1:' + self.opts['local_port']
self.clients = self.context.socket(zmq.XREP)
# Create workers inproc
self.w_uri = 'inproc://locals'
@ -172,23 +172,3 @@ class LocalServer(threading.Thread):
continue
cmd = salt.utils.prep_publish_cmd(message['cmd'])
self.publisher.command(cmd)
def __bind(self):
'''
Binds the reply server
'''
self.clients.bind(self.c_uri)
self.workers.bind(self.w_uri)
for ind in range(int(self.num_threads)):
proc = threading.Thread(target=self.__worker)
proc.start()
zmq.device(zmq.QUEUE, self.clients, self.workers)
def run(self):
'''
Start up the ReqServer
'''
self.__bind()