Handling error from using gevent 1.1.

This commit is contained in:
Jake Hilton 2016-03-02 12:11:38 -07:00
parent 38ddd62aef
commit 02fb5ed616

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']()