From 0f12959d537e8e65d8f02da0dd251d1344b61fd1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 22 Sep 2020 12:26:54 +0100 Subject: [PATCH] plugins/edsm: Also DEBUG log Location and Docked events. --- plugins/edsm.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/edsm.py b/plugins/edsm.py index 44a75131..895127ac 100644 --- a/plugins/edsm.py +++ b/plugins/edsm.py @@ -217,7 +217,7 @@ def credentials(cmdr): def journal_entry(cmdr, is_beta, system, station, entry, state): - if entry['event'] in ('CarrierJump', 'FSDJump'): + if entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'): logger.debug(f'''{entry["event"]} Commander: {cmdr} System: {system} @@ -300,7 +300,7 @@ entry: {entry!r}''' materials.update(transient) this.queue.put((cmdr, materials)) - if entry['event'] in ('CarrierJump', 'FSDJump'): + if entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'): logger.debug(f'''{entry["event"]} Queueing: {entry!r}''' ) @@ -359,11 +359,11 @@ def worker(): retrying = 0 while retrying < 3: try: - if item and entry['event'] in ('CarrierJump', 'FSDJump'): + if item and entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'): logger.debug(f'{entry["event"]}') if item and entry['event'] not in this.discardedEvents: - if entry['event'] in ('CarrierJump', 'FSDJump'): + if entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'): logger.debug(f'{entry["event"]} event not in discarded list') pending.append(entry) @@ -377,7 +377,7 @@ def worker(): pending = [x for x in pending if x['event'] not in this.discardedEvents] # Filter out unwanted events if should_send(pending): - if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump')]): + if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked')]): logger.debug('CarrierJump (or FSDJump) in pending and it passed should_send()') (username, apikey) = credentials(cmdr) @@ -389,7 +389,7 @@ def worker(): 'message': json.dumps(pending, ensure_ascii=False).encode('utf-8'), } - if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump')]): + if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked')]): data_elided = data.copy() data_elided['apiKey'] = '' logger.debug(f'''CarrierJump (or FSDJump): Attempting API call