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

Merge pull request #1221 from EDCD/fix/1216-shiplocker-load-failure

Browse Source 
monitor: Retry on ShipLocker.json load/decode failure
This commit is contained in:
Athanasius 2021-08-07 15:03:11 +01:00 committed by GitHub
commit 9cf71113ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
monitor.py
View File

@ -203,7 +203,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
key=lambda x: x.split('.')[1:] key=lambda x: x.split('.')[1:]
) )
self.logfile = join(self.currentdir, logfiles[-1]) if logfiles else None self.logfile = join(self.currentdir, logfiles[-1]) if logfiles else None # type: ignore
except Exception: except Exception:
logger.exception('Failed to find latest logfile') logger.exception('Failed to find latest logfile')
@ -866,28 +866,42 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
elif event_type == 'shiplocker': elif event_type == 'shiplocker':
# As of 4.0.0.400 (2021-06-10) # As of 4.0.0.400 (2021-06-10)
# "ShipLocker" will be a full list written to the journal at startup/boarding/disembarking, and also # "ShipLocker" will be a full list written to the journal at startup/boarding, and also
# written to a separate shiplocker.json file - other updates will just update that file and mention it # written to a separate shiplocker.json file - other updates will just update that file and mention it
# has changed with an empty shiplocker event in the main journal. # has changed with an empty shiplocker event in the main journal.
# Always attempt loading of this. # Always attempt loading of this, but if it fails we'll hope this was
# Confirmed filename for 4.0.0.400 # a startup/boarding version and thus `entry` contains
try: # the data anyway.
currentdir_path = pathlib.Path(str(self.currentdir)) currentdir_path = pathlib.Path(str(self.currentdir))
with open(currentdir_path / 'ShipLocker.json', 'rb') as h: # type: ignore shiplocker_filename = currentdir_path / 'ShipLocker.json'
shiplocker_max_attempts = 5
shiplocker_fail_sleep = 0.01
attempts = 0
while attempts < shiplocker_max_attempts:
attempts += 1
try:
with open(shiplocker_filename, 'rb') as h: # type: ignore
entry = json.load(h, object_pairs_hook=OrderedDict) entry = json.load(h, object_pairs_hook=OrderedDict)
self.state['ShipLockerJSON'] = entry self.state['ShipLockerJSON'] = entry
break
except FileNotFoundError: except FileNotFoundError:
logger.warning('ShipLocker event but no ShipLocker.json file') logger.warning('ShipLocker event but no ShipLocker.json file')
sleep(shiplocker_fail_sleep)
pass pass
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
logger.warning(f'ShipLocker.json failed to decode:\n{e!r}\n') logger.warning(f'ShipLocker.json failed to decode:\n{e!r}\n')
sleep(shiplocker_fail_sleep)
pass pass
else:
logger.warning(f'Failed to load & decode shiplocker after {shiplocker_max_attempts} tries. '
'Giving up.')
if not all(t in entry for t in ('Components', 'Consumables', 'Data', 'Items')): if not all(t in entry for t in ('Components', 'Consumables', 'Data', 'Items')):
logger.trace('ShipLocker event is an empty one (missing at least one data type)') logger.warning('ShipLocker event is missing at least one category')
# This event has the current totals, so drop any current data # This event has the current totals, so drop any current data
self.state['Component'] = defaultdict(int) self.state['Component'] = defaultdict(int)
@ -895,10 +909,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['Item'] = defaultdict(int) self.state['Item'] = defaultdict(int)
self.state['Data'] = defaultdict(int) self.state['Data'] = defaultdict(int)
# 4.0.0.400 - No longer zeroing out the BackPack in this event,
# as we should now always get either `Backpack` event/file or
# `BackpackChange` as needed.
clean_components = self.coalesce_cargo(entry['Components']) clean_components = self.coalesce_cargo(entry['Components'])
self.state['Component'].update( self.state['Component'].update(
{self.canonicalise(x['Name']): x['Count'] for x in clean_components} {self.canonicalise(x['Name']): x['Count'] for x in clean_components}
@ -1601,7 +1611,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['GameVersion'] = entry['gameversion'] self.state['GameVersion'] = entry['gameversion']
self.state['GameBuild'] = entry['build'] self.state['GameBuild'] = entry['build']
self.version = self.state['GameVersion'] self.version = self.state['GameVersion']
self.is_beta = any(v in self.version.lower() for v in ('alpha', 'beta')) self.is_beta = any(v in self.version.lower() for v in ('alpha', 'beta')) # type: ignore
except KeyError: except KeyError:
if not suppress: if not suppress:
raise raise