Fix GPS over TCP connection error detection

EarToEarOak · Mar 27, 2017 · 183bb78 · 183bb78
1 parent ec1f76a
commit 183bb78
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rtlsdr_scanner/cli.py b/rtlsdr_scanner/cli.py
@@ -253,7 +253,7 @@ def __process_event(self, queue):
                                                       arg2[1],
                                                       arg2[2])
         elif status == Event.LOC_ERR:
-            print '{}'.format(arg2)
+            print 'Error: {}'.format(arg2)
             exit(1)
 
         return status

diff --git a/rtlsdr_scanner/location.py b/rtlsdr_scanner/location.py
@@ -83,6 +83,9 @@ def __tcp_connect(self, defaultPort):
         except socket.error as error:
             post_event(self._notify, EventThread(Event.LOC_ERR,
                                                  0, error))
+            return False
+
+        return True
 
     def __tcp_read(self, isGpsd=False):
         buf = ''
@@ -179,7 +182,8 @@ def __serial_read(self):
                 time.sleep(0.1)
 
     def __gpsd_open(self):
-        self.__tcp_connect(2947)
+        if not self.__tcp_connect(2947):
+            return False
 
         try:
             if self._device.type == DeviceGPS.GPSD:
@@ -249,8 +253,7 @@ def __nmea_open(self):
         if self._device.type == DeviceGPS.NMEA_SERIAL:
             return self.__serial_connect()
         else:
-            self.__tcp_connect(10110)
-            return True
+            return self.__tcp_connect(10110)
 
     def __nmea_read(self):
         if self._device.type == DeviceGPS.NMEA_SERIAL: