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

Move the check_max_open_files into loop_interval.

Browse Source 
Since check_max_open_files has no bearing on wether we accept the minion or not, there is no reason to list the directory on every auth call. With this mechanism it is a "fixed cost" since it will run at loop_interval instead of on each auth call
This commit is contained in:
Thomas Jackson 2013-12-20 11:19:02 -08:00
parent 941e37b596
commit ff64040edc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/master.py
View File

@ -230,6 +230,10 @@ class Master(SMaster):
log.error(
'Exception {0} occurred in file server update'.format(exc)
)
# check how close to FD limits you are
salt.utils.verify.check_max_open_files(self.opts)
try:
schedule.eval()
# Check if scheduler requires lower loop interval than
@ -1777,15 +1781,13 @@ class ClearFuncs(object):
This method fires an event over the master event manager. The event is
tagged "auth" and returns a dict with information about the auth
event
'''
# 0. Check for max open files
# 1. Verify that the key we are receiving matches the stored key
# 2. Store the key if it is not there
# 3. make an RSA key with the pub key
# 4. encrypt the AES key as an encrypted salt.payload
# 5. package the return and return it
salt.utils.verify.check_max_open_files(self.opts)
# Verify that the key we are receiving matches the stored key
# Store the key if it is not there
# Make an RSA key with the pub key
# Encrypt the AES key as an encrypted salt.payload
# Package the return and return it
'''
if not salt.utils.verify.valid_id(self.opts, load['id']):
log.info(