ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-07 10:53:26 +03:00
Code Issues Projects Releases Wiki Activity

plugins/edsm: start/stop detailed logging.

Browse Source
This commit is contained in:
Athanasius 2020-10-14 12:13:06 +01:00
parent 983e4d7acb
commit 8aac704fa1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/edsm.py
View File

@ -143,9 +143,11 @@ def plugin_start3(plugin_dir: str) -> str:
config.delete('edsm_autoopen') config.delete('edsm_autoopen')
config.delete('edsm_historical') config.delete('edsm_historical')
logger.debug('Starting worker thread...')
this.thread = Thread(target=worker, name='EDSM worker') this.thread = Thread(target=worker, name='EDSM worker')
this.thread.daemon = True this.thread.daemon = True
this.thread.start() this.thread.start()
logger.debug('Done.')
return 'EDSM' return 'EDSM'
@ -158,13 +160,15 @@ def plugin_app(parent: tk.Tk) -> None:
def plugin_stop() -> None: def plugin_stop() -> None:
"""Plugin exit hook.""" """Stop this plugin."""
logger.debug('Signalling queue to close...')
# Signal thread to close and wait for it # Signal thread to close and wait for it
this.queue.put(None) this.queue.put(None)
this.thread.join() this.thread.join()
this.thread = None this.thread = None
# Suppress 'Exception ignored in: <function Image.__del__ at ...>' errors # TODO: this is bad. # Suppress 'Exception ignored in: <function Image.__del__ at ...>' errors # TODO: this is bad.
this._IMG_KNOWN = this._IMG_UNKNOWN = this._IMG_NEW = this._IMG_ERROR = None this._IMG_KNOWN = this._IMG_UNKNOWN = this._IMG_NEW = this._IMG_ERROR = None
logger.debug('Done.')
def plugin_prefs(parent: tk.Tk, cmdr: str, is_beta: bool) -> tk.Frame: def plugin_prefs(parent: tk.Tk, cmdr: str, is_beta: bool) -> tk.Frame:
@ -485,10 +489,11 @@ def cmdr_data(data: Mapping[str, Any], is_beta: bool) -> None:
# Worker thread # Worker thread
def worker() -> None: def worker() -> None:
""" """
Upload worker. Handle uploading events to EDSM API.
Processes `this.queue` until the queued item is None. Processes `this.queue` until the queued item is None.
""" """
logger.debug('Starting...')
pending = [] # Unsent events pending = [] # Unsent events
closing = False closing = False
@ -496,7 +501,9 @@ def worker() -> None:
item: Optional[Tuple[str, Mapping[str, Any]]] = this.queue.get() item: Optional[Tuple[str, Mapping[str, Any]]] = this.queue.get()
if item: if item:
(cmdr, entry) = item (cmdr, entry) = item
else: else:
logger.debug('Empty queue message, setting closing = True')
closing = True # Try to send any unsent events before we close closing = True # Try to send any unsent events before we close
retrying = 0 retrying = 0
@ -618,8 +625,11 @@ def worker() -> None:
plug.show_error(_("Error: Can't connect to EDSM")) plug.show_error(_("Error: Can't connect to EDSM"))
if closing: if closing:
logger.debug('closing, so returning.')
return return
logger.debug('Done.')
def should_send(entries: List[Mapping[str, Any]]) -> bool: def should_send(entries: List[Mapping[str, Any]]) -> bool:
""" """