Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-23 00:36:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix eventlogger

Browse Source
This commit is contained in:
holger krekel
2020-02-21 20:54:42 +01:00
parent e22e5045f1
commit e064e02794
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/src/deltachat/account.py
View File

@@ -38,7 +38,7 @@ class Account(object):
lib.dc_context_new(lib.py_dc_callback, ffi.NULL, as_dc_charpointer(os_name)), lib.dc_context_new(lib.py_dc_callback, ffi.NULL, as_dc_charpointer(os_name)),
_destroy_dc_context, _destroy_dc_context,
) )
self._evlogger = EventLogger(self._dc_context, logid, debug) self._evlogger = EventLogger(self, logid, debug)
self._threads = IOThreads(self._dc_context, self._evlogger._log_event) self._threads = IOThreads(self._dc_context, self._evlogger._log_event)
# register event call back and initialize plugin system # register event call back and initialize plugin system

13
python/src/deltachat/eventlogger.py
View File

@@ -8,20 +8,21 @@ from .hookspec import hookimpl
class EventLogger: class EventLogger:
_loglock = threading.RLock() _loglock = threading.RLock()
def __init__(self, dc_context, logid=None, debug=True): def __init__(self, account, logid=None, debug=True):
self._dc_context = dc_context self.account = account
self._event_queue = Queue() self._event_queue = Queue()
self._debug = debug self._debug = debug
if logid is None: if logid is None:
logid = str(self._dc_context).strip(">").split()[-1] logid = str(self.account._dc_context).strip(">").split()[-1]
self.logid = logid self.logid = logid
self._timeout = None self._timeout = None
self.init_time = time.time() self.init_time = time.time()
@hookimpl @hookimpl
def process_low_level_event(self, event_name, data1, data2): def process_low_level_event(self, account, event_name, data1, data2):
self._log_event(event_name, data1, data2) if self.account == account:
self._event_queue.put((event_name, data1, data2)) self._log_event(event_name, data1, data2)
self._event_queue.put((event_name, data1, data2))
def set_timeout(self, timeout): def set_timeout(self, timeout):
self._timeout = timeout self._timeout = timeout