From c38c67a10f5bdd217e8ae8cab19dd5a4d754643e Mon Sep 17 00:00:00 2001
From: "Carey, Matthew" <Matthew.Carey6@t-mobile.com>
Date: Tue, 29 Jan 2019 09:59:53 -0500
Subject: [PATCH] Fixed bug causing crash with invalid server ID

---
 influxspeedtest/InfluxdbSpeedtest.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/influxspeedtest/InfluxdbSpeedtest.py b/influxspeedtest/InfluxdbSpeedtest.py
index fb16179..a32cf4b 100644
--- a/influxspeedtest/InfluxdbSpeedtest.py
+++ b/influxspeedtest/InfluxdbSpeedtest.py
@@ -71,17 +71,7 @@ class InfluxdbSpeedtest():
             log.critical('Failed to get speedtest.net configuration.  Aborting')
             sys.exit(1)
 
-        try:
-            self.speedtest.get_servers(server)
-        except speedtest.NoMatchedServers:
-            log.error('No matched servers: %s', server)
-            return
-        except speedtest.ServersRetrievalError:
-            log.critical('Cannot retrieve speedtest.net server list. Aborting')
-            sys.exit(1)
-        except speedtest.InvalidServerIDType:
-            log.error('%s is an invalid server type, must be int', server)
-            return
+        self.speedtest.get_servers(server)
 
         log.debug('Picking the closest server')
 
@@ -120,7 +110,19 @@ class InfluxdbSpeedtest():
         :param server: Server to test against
         """
         log.info('Starting Speed Test For Server %s', server)
-        self.setup_speedtest(server)
+
+        try:
+            self.setup_speedtest(server)
+        except speedtest.NoMatchedServers:
+            log.error('No matched servers: %s', server)
+            return
+        except speedtest.ServersRetrievalError:
+            log.critical('Cannot retrieve speedtest.net server list. Aborting')
+            return
+        except speedtest.InvalidServerIDType:
+            log.error('%s is an invalid server type, must be int', server)
+            return
+
         log.info('Starting download test')
         self.speedtest.download()
         log.info('Starting upload test')
-- 
GitLab