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

Merge pull request #31627 from jakehilton/2015.8

Browse source 
Handling error from using gevent 1.1.
This commit is contained in:
Mike Place 2016-03-02 15:01:22 -07:00
commit cc4c31cf7f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/state.py
View file

@ -804,6 +804,8 @@ class State(object):
reload(site)
except RuntimeError:
log.error('Error encountered during module reload. Modules were not reloaded.')
except TypeError:
log.error('Error encountered during module reload. Modules were not reloaded.')
self.load_modules(proxy=self.proxy)
if not self.opts.get('local', False) and self.opts.get('multiprocessing', True):
self.functions['saltutil.refresh_modules']()