reduce logging verbosity a bit

change version to 0.3.5

mlat/client/coordinator.py

@@ -208,9 +208,7 @@ def send_rate_report(self, now):
             self.server.send_rate_report(rate_report)
 
     def periodic_stats(self, now):
-        log('Receiver status: {0}', self.receiver.state)
-        log('Server status:   {0}', self.server.state)
-        global_stats.log_and_reset()
+        global_stats.log_and_reset(self)
 
         adsb_req = adsb_total = modes_req = modes_total = 0
         now = monotonic_time()

mlat/client/jsonclient.py

@@ -490,10 +490,10 @@ def handle_handshake_response(self, response):
         else:
             self.send_split_sync = None
 
-        log('Handshake complete.')
-        log('  Compression:       {0}', compress)
-        log('  UDP transport:     {0}', self.udp_transport and str(self.udp_transport) or 'disabled')
-        log('  Split sync:        {0}', self.send_split_sync and 'enabled' or 'disabled')
+        log('Handshake complete: Compression {0}, UDP transport {1}, Split sync {2}',
+                compress,
+                self.udp_transport and str(self.udp_transport) or 'disabled',
+                self.send_split_sync and 'enabled' or 'disabled')
 
         self.state = 'ready'
         self.handle_server_line = self.handle_connected_request

mlat/client/net.py

@@ -129,10 +129,10 @@ def reconnect(self):
                             self.port = self.adsbexchangePorts[(index + 1) % len(self.adsbexchangePorts)]
                             break
 
-                if self.host == 'feed.adsbexchange.com' and self.basePort != self.port:
-                    log('Connecting to {host}:{port} (trying hard-coded alternate port for adsbexchange)', host=self.host, port=self.port)
-                else:
-                    log('Connecting to {host}:{port}', host=self.host, port=self.port)
+                #if self.host == 'feed.adsbexchange.com' and self.basePort != self.port:
+                #    log('Connecting to {host}:{port} (trying hard-coded alternate port for adsbexchange)', host=self.host, port=self.port)
+                #else:
+                #    log('Connecting to {host}:{port}', host=self.host, port=self.port)
 
                 self.addrlist = socket.getaddrinfo(host=self.host,
                                                    port=self.port,

mlat/client/stats.py

@@ -40,25 +40,28 @@ def reset(self, now=None):
         self.receiver_rx_mlat = 0
         self.mlat_positions = 0
 
-    def log_and_reset(self):
+    def log_and_reset(self, coordinator):
         now = monotonic_time()
         elapsed = now - self.start
 
+        #log('Receiver status: {0}', coordinator.receiver.state)
+        #log('Server status:   {0}', coordinator.server.state)
+
         processed = self.receiver_rx_messages - self.receiver_rx_filtered
-        log('Receiver: {0:6.1f} msg/s received     {1:6.1f} msg/s processed ({2:.0f}%)',
+        log('Receiver: {3:10s} {0:6.1f} msg/s received     {1:6.1f} msg/s processed ({2:.0f}%)',
             self.receiver_rx_messages / elapsed,
             processed / elapsed,
-            0 if self.receiver_rx_messages == 0 else 100.0 * processed / self.receiver_rx_messages)
+            0 if self.receiver_rx_messages == 0 else 100.0 * processed / self.receiver_rx_messages,
+            coordinator.receiver.state)
         if self.receiver_rx_mlat:
             log('WARNING: Ignored {0:5d} messages with MLAT magic timestamp (do you have --forward-mlat on?)',
                 self.receiver_rx_mlat)
-        log('Server:   {0:6.1f} kB/s from server   {1:4.1f}kB/s TCP to server  {2:6.1f}kB/s UDP to server',
+        log('Server:   {0:10s} {1:6.1f} kB/s from server   {2:6.1f} kB/s to server',
+            coordinator.server.state,
             self.server_rx_bytes / elapsed / 1000.0,
-            self.server_tx_bytes / elapsed / 1000.0,
-            self.server_udp_bytes / elapsed / 1000.0)
-        if self.mlat_positions:
-            log('Results:  {0:3.1f} positions/minute',
-                self.mlat_positions / elapsed * 60.0)
+            (self.server_tx_bytes + self.server_udp_bytes) / elapsed / 1000.0)
+        log('Results:  {0:3.1f} positions/minute',
+            self.mlat_positions / elapsed * 60.0)
         self.reset(now)
 
 

mlat/client/version.py

@@ -18,4 +18,4 @@
 
 """Just a version constant!"""
 
-CLIENT_VERSION = "0.3.1"
+CLIENT_VERSION = "0.3.5"