Private GIT

Skip to content
Snippets Groups Projects
Commit c38c67a1 authored by Carey, Matthew's avatar Carey, Matthew
Browse files

Fixed bug causing crash with invalid server ID

parent d250078b
Branches Issue-21
No related tags found
No related merge requests found
...@@ -71,17 +71,7 @@ class InfluxdbSpeedtest(): ...@@ -71,17 +71,7 @@ class InfluxdbSpeedtest():
log.critical('Failed to get speedtest.net configuration. Aborting') log.critical('Failed to get speedtest.net configuration. Aborting')
sys.exit(1) sys.exit(1)
try:
self.speedtest.get_servers(server) 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
log.debug('Picking the closest server') log.debug('Picking the closest server')
...@@ -120,7 +110,19 @@ class InfluxdbSpeedtest(): ...@@ -120,7 +110,19 @@ class InfluxdbSpeedtest():
:param server: Server to test against :param server: Server to test against
""" """
log.info('Starting Speed Test For Server %s', server) log.info('Starting Speed Test For Server %s', server)
try:
self.setup_speedtest(server) 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') log.info('Starting download test')
self.speedtest.download() self.speedtest.download()
log.info('Starting upload test') log.info('Starting upload test')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment