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

EDMC.py: Fix up other call to companion.session.station()

Browse Source 
* Opening of latest journal file didn't match how done in monitor.py.
  This caused `str` instead of `bytes` being passed to `monitor.parse_entry()`.
* It was assuming pre-threaded return of data.  Now properly gets it from
  the queue.
This commit is contained in:
Athanasius 2022-12-22 14:22:06 +00:00
parent 26b12f5b14
commit 9e605d31c7
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
EDMC.py
View File

@ -71,7 +71,7 @@ def versioncmp(versionstring) -> List:
return list(map(int, versionstring.split('.'))) return list(map(int, versionstring.split('.')))
def deep_get(target: dict, *args: str, default=None) -> Any: def deep_get(target: dict | companion.CAPIData, *args: str, default=None) -> Any:
""" """
Walk into a dict and return the specified deep value. Walk into a dict and return the specified deep value.
@ -224,12 +224,15 @@ sys.path: {sys.path}'''
logger.debug(f'logdir = "{monitor.currentdir}"') logger.debug(f'logdir = "{monitor.currentdir}"')
logfile = monitor.journal_newest_filename(monitor.currentdir) logfile = monitor.journal_newest_filename(monitor.currentdir)
if logfile is None:
raise ValueError("None from monitor.journal_newest_filename")
logger.debug(f'Using logfile "{logfile}"') logger.debug(f'Using logfile "{logfile}"')
with open(logfile, 'r', encoding='utf-8') as loghandle: with open(logfile, 'rb', 0) as loghandle:
for line in loghandle: for line in loghandle:
try: try:
monitor.parse_entry(line) monitor.parse_entry(line)
except Exception: except Exception:
logger.debug(f'Invalid journal entry {line!r}') logger.debug(f'Invalid journal entry {line!r}')
@ -410,7 +413,23 @@ sys.path: {sys.path}'''
# Retry for shipyard # Retry for shipyard
sleep(SERVER_RETRY) sleep(SERVER_RETRY)
new_data = companion.session.station() companion.session.station(int(time()))
# Wait for the response
_capi_request_timeout = 60
try:
capi_response = companion.session.capi_response_queue.get(
block=True, timeout=_capi_request_timeout
)
except queue.Empty:
logger.error(f'CAPI requests timed out after {_capi_request_timeout} seconds')
sys.exit(EXIT_SERVER)
if isinstance(capi_response, companion.EDMCCAPIFailedRequest):
logger.error(f'Failed Request: {capi_response.message}')
sys.exit(EXIT_SERVER)
new_data = capi_response.capi_data
# might have undocked while we were waiting for retry in which case station data is unreliable # might have undocked while we were waiting for retry in which case station data is unreliable
if new_data['commander'].get('docked') and \ if new_data['commander'].get('docked') and \
deep_get(new_data, 'lastSystem', 'name') == monitor.system and \ deep_get(new_data, 'lastSystem', 'name') == monitor.system and \