Double lock check to make get_plugin thread-safe
This commit is contained in:
parent
105d5bb2fc
commit
4c6b38a6e2
1 changed files with 6 additions and 6 deletions
|
@ -71,6 +71,10 @@ def get_plugin(plugin_name, reload=False):
|
|||
global plugins
|
||||
global plugins_init_locks
|
||||
|
||||
if plugin_name not in plugins_init_locks:
|
||||
plugins_init_locks[plugin_name] = Lock()
|
||||
|
||||
with plugins_init_locks[plugin_name]:
|
||||
if plugin_name in plugins and not reload:
|
||||
return plugins[plugin_name]
|
||||
|
||||
|
@ -91,13 +95,9 @@ def get_plugin(plugin_name, reload=False):
|
|||
|
||||
try:
|
||||
plugin_class = getattr(plugin, cls_name)
|
||||
if plugin_name not in plugins_init_locks:
|
||||
plugins_init_locks[plugin_name] = Lock()
|
||||
|
||||
with plugins_init_locks[plugin_name]:
|
||||
plugin = plugin_class(**plugin_conf)
|
||||
|
||||
plugins[plugin_name] = plugin
|
||||
except AttributeError as e:
|
||||
logger.warning('No such class in {}: {}'.format(plugin_name, cls_name))
|
||||
raise RuntimeError(e)
|
||||
|
|
Loading…
Reference in a new issue