ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 23:59:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #710 from EDCD/fix/edsm-carrierjump

Browse Source 
Add detailed logging of Carrier/FSDJump to edsm plugin
This commit is contained in:
Athanasius 2020-09-18 15:35:55 +01:00 committed by GitHub
commit 3864f1fd80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/edsm.py
View File

@ -217,6 +217,15 @@ def credentials(cmdr):
def journal_entry(cmdr, is_beta, system, station, entry, state): def journal_entry(cmdr, is_beta, system, station, entry, state):
if entry['event'] in ('CarrierJump', 'FSDJump'):
logger.debug(f'''{entry["event"]}
Commander: {cmdr}
System: {system}
Station: {station}
state: {state!r}
entry: {entry!r}'''
)
# Always update our system address even if we're not currently the provider for system or station, but dont update # Always update our system address even if we're not currently the provider for system or station, but dont update
# on events that contain "future" data, such as FSDTarget # on events that contain "future" data, such as FSDTarget
if entry['event'] in ('Location', 'Docked', 'CarrierJump', 'FSDJump'): if entry['event'] in ('Location', 'Docked', 'CarrierJump', 'FSDJump'):
@ -291,6 +300,10 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
materials.update(transient) materials.update(transient)
this.queue.put((cmdr, materials)) this.queue.put((cmdr, materials))
if entry['event'] in ('CarrierJump', 'FSDJump'):
logger.debug(f'''{entry["event"]}
Queueing: {entry!r}'''
)
this.queue.put((cmdr, entry)) this.queue.put((cmdr, entry))
@ -346,7 +359,12 @@ def worker():
retrying = 0 retrying = 0
while retrying < 3: while retrying < 3:
try: try:
if item and entry['event'] in ('CarrierJump', 'FSDJump'):
logger.debug(f'{entry["event"]}')
if item and entry['event'] not in this.discardedEvents: if item and entry['event'] not in this.discardedEvents:
if entry['event'] in ('CarrierJump', 'FSDJump'):
logger.debug(f'{entry["event"]} event not in discarded list')
pending.append(entry) pending.append(entry)
# Get list of events to discard # Get list of events to discard
@ -359,6 +377,9 @@ def worker():
pending = [x for x in pending if x['event'] not in this.discardedEvents] # Filter out unwanted events pending = [x for x in pending if x['event'] not in this.discardedEvents] # Filter out unwanted events
if should_send(pending): if should_send(pending):
if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump')]):
logger.debug('CarrierJump (or FSDJump) in pending and it passed should_send()')
(username, apikey) = credentials(cmdr) (username, apikey) = credentials(cmdr)
data = { data = {
'commanderName': username.encode('utf-8'), 'commanderName': username.encode('utf-8'),
@ -367,6 +388,13 @@ def worker():
'fromSoftwareVersion': appversion, 'fromSoftwareVersion': appversion,
'message': json.dumps(pending, ensure_ascii=False).encode('utf-8'), 'message': json.dumps(pending, ensure_ascii=False).encode('utf-8'),
} }
if any([p for p in pending if p['event'] in ('CarrierJump', 'FSDJump')]):
data_elided = data.copy()
data_elided['apiKey'] = '<elided>'
logger.debug(f'''CarrierJump (or FSDJump): Attempting API call
data: {data_elided!r}'''
)
r = this.session.post('https://www.edsm.net/api-journal-v1', data=data, timeout=_TIMEOUT) r = this.session.post('https://www.edsm.net/api-journal-v1', data=data, timeout=_TIMEOUT)
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()
@ -448,4 +476,3 @@ def edsm_notify_system(reply):
this.system_link['image'] = this._IMG_NEW this.system_link['image'] = this._IMG_NEW
else: else:
this.system_link['image'] = this._IMG_KNOWN this.system_link['image'] = this._IMG_KNOWN