From e314f64464fa4d2e087e7c85f4ace712c8831db9 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Mon, 21 Aug 2017 18:50:32 +0100
Subject: [PATCH] Log server lagging
---
EDMarketConnector.py | 5 +++--
monitor.py | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index b7b0e102..ed5b6012 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -448,7 +448,7 @@ class AppWindow:
raise companion.CmdrError() # Companion API return doesn't match Journal
elif ((auto_update and not data['commander'].get('docked')) or
(data['lastSystem']['name'] != monitor.system) or
- ((monitor.station or data['commander']['docked']) and data['lastStarport']['name'] != monitor.station) or
+ ((data['commander']['docked'] and data['lastStarport']['name'] or None) != monitor.station) or
(data['ship']['id'] != monitor.state['ShipID']) or
(data['ship']['name'].lower() != monitor.state['ShipType'])):
raise companion.ServerLagging()
@@ -483,7 +483,7 @@ class AppWindow:
pass
elif not data['commander'].get('docked'):
- if not event and not retrying:
+ if auto_update and not retrying:
# Silently retry if we got here by 'Automatically update on docking' and the server hasn't caught up
self.w.after(int(SERVER_RETRY * 1000), lambda:self.getandsend(event, True))
return # early exit to avoid starting cooldown count
@@ -536,6 +536,7 @@ class AppWindow:
# Companion API problem
except (companion.ServerError, companion.ServerLagging) as e:
if retrying:
+ print 'Lagging: %s,%s != %s,%s' % (data['lastSystem']['name'], data['commander']['docked'] and data['lastStarport']['name'] or 'undocked', monitor.system, monitor.station)
self.status['text'] = unicode(e)
play_bad = True
else:
diff --git a/monitor.py b/monitor.py
index 27ad75ce..6ebad768 100644
--- a/monitor.py
+++ b/monitor.py
@@ -392,8 +392,8 @@ class EDLogs(FileSystemEventHandler):
self.coordinates = tuple(entry['StarPos'])
elif self.system != entry['StarSystem']:
self.coordinates = None # Docked event doesn't include coordinates
- self.system = entry['StarSystem'] == 'ProvingGround' and 'CQC' or entry['StarSystem']
- self.station = entry.get('StationName') # May be None
+ (self.system, self.station) = (entry['StarSystem'] == 'ProvingGround' and 'CQC' or entry['StarSystem'],
+ entry.get('StationName')) # May be None
self.stationtype = entry.get('StationType') # May be None
elif entry['event'] == 'SupercruiseExit':
self.planet = entry.get('Body') if entry.get('BodyType') == 'Planet' else None