chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed locked callback call on plugins

Browse Source
This commit is contained in:
Simone Margaritelli
2019-12-10 21:17:46 +02:00
parent 93bb633010
commit 81061cea24
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pwnagotchi/plugins/__init__.py
View File

@ -58,6 +58,12 @@ def on(event_name, *args, **kwargs):
one(plugin_name, event_name, *args, **kwargs) one(plugin_name, event_name, *args, **kwargs)
def locked_cb(name, cb, *args, **kwargs):
global locks
with locks[name]:
cb(*args, *kwargs)
def one(plugin_name, event_name, *args, **kwargs): def one(plugin_name, event_name, *args, **kwargs):
global loaded, locks global loaded, locks
@ -67,8 +73,8 @@ def one(plugin_name, event_name, *args, **kwargs):
callback = getattr(plugin, cb_name, None) callback = getattr(plugin, cb_name, None)
if callback is not None and callable(callback): if callback is not None and callable(callback):
try: try:
with locks["%s::%s" % (plugin_name, cb_name)]: lock_name = "%s::%s" % (plugin_name, cb_name)
_thread.start_new_thread(callback, (*args, *kwargs)) _thread.start_new_thread(locked_cb, (lock_name, callback, *args, *kwargs))
except Exception as e: except Exception as e:
logging.error("error while running %s.%s : %s" % (plugin_name, cb_name, e)) logging.error("error while running %s.%s : %s" % (plugin_name, cb_name, e))
logging.error(e, exc_info=True) logging.error(e, exc_info=True)