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

Initialize a unique context per wheel/runner execution

Browse Source
This commit is contained in:
Thomas Jackson 2015-10-17 11:21:57 -07:00
parent 117a713502
commit 391e31a525
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/client/mixins.py
View File

@ -10,6 +10,7 @@ import weakref
import traceback
import collections
import multiprocessing
import tornado.stack_context
# Import Salt libs
import salt.exceptions
@ -333,8 +334,10 @@ class SyncClientMixin(object):
else:
kwargs = low['kwargs']
data['return'] = self.functions[fun](*args, **kwargs)
data['success'] = True
# Initialize a context for executing the method.
with tornado.stack_context.StackContext(self.functions.context_dict.clone):
data['return'] = self.functions[fun](*args, **kwargs)
data['success'] = True
except (Exception, SystemExit) as ex:
if isinstance(ex, salt.exceptions.NotImplemented):
data['return'] = str(ex)