valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #833 from dcolish/develop

Browse Source 
Fix dynamic reloading of grains
This commit is contained in:
Thomas S Hatch 2012-03-04 13:33:53 -08:00
commit 66611b9dcf
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/minion.py
View File

@ -141,6 +141,7 @@ class Minion(object):
Return the functions and the returners loaded up from the loader
module
'''
self.opts['grains'] = salt.loader.grains(self.opts)
functions = salt.loader.minion_mods(self.opts)
returners = salt.loader.returners(self.opts)
return functions, returners
@ -397,6 +398,11 @@ class Minion(object):
open(fn_, 'w+').write(self.serial.dumps(ret))
return ret_val
@property
def master_pub(self):
return 'tcp://{ip}:{port}'.format(ip=self.opts['master_ip'],
port=self.publish_port)
def authenticate(self):
'''
Authenticate with the master, this method breaks the functional
@ -431,14 +437,10 @@ class Minion(object):
'''
Lock onto the publisher. This is the main event loop for the minion
'''
master_pub = 'tcp://{0}:{1}'.format(
self.opts['master_ip'],
str(self.publish_port)
)
context = zmq.Context()
socket = context.socket(zmq.SUB)
socket.setsockopt(zmq.SUBSCRIBE, '')
socket.connect(master_pub)
socket.connect(self.master_pub)
if self.opts['sub_timeout']:
last = time.time()
while True:
@ -463,7 +465,7 @@ class Minion(object):
socket.close()
socket = context.socket(zmq.SUB)
socket.setsockopt(zmq.SUBSCRIBE, '')
socket.connect(master_pub)
socket.connect(self.master_pub)
last = time.time()
time.sleep(0.05)
multiprocessing.active_children()

27
salt/state.py
View File

@ -163,28 +163,23 @@ class State(object):
python, pyx, or .so. Always refresh if the function is recuse,
since that can lay down anything.
'''
def _refresh():
self.load_modules()
module_refresh_path = os.path.join(
self.opts['cachedir'],
'module_refresh')
with open(module_refresh_path, 'w+') as f:
f.write('')
if data['state'] == 'file':
if data['fun'] == 'managed':
if data['name'].endswith(
('.py', '.pyx', '.pyo', '.pyc', '.so')):
self.load_modules()
open(os.path.join(
self.opts['cachedir'],
'module_refresh'),
'w+').write('')
_refresh()
elif data['fun'] == 'recurse':
self.load_modules()
open(os.path.join(
self.opts['cachedir'],
'module_refresh'),
'w+').write('')
_refresh()
elif data['state'] == 'pkg':
self.load_modules()
open(os.path.join(
self.opts['cachedir'],
'module_refresh'),
'w+').write('')
_refresh()
def format_verbosity(self, returns):
'''