diff --git a/.gitignore b/.gitignore index 30baab3..897ed13 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ include/ lib/ .idea config.json - +run_ping.sh diff --git a/main.py b/main.py index e44625b..d4edbaf 100644 --- a/main.py +++ b/main.py @@ -2,10 +2,8 @@ import downloader import config -import ping if __name__ == "__main__": config.init_config() downloader.download_file() - ping.ping() print("Finished.") diff --git a/ping.py b/ping.py index d44a4d3..7759183 100644 --- a/ping.py +++ b/ping.py @@ -1,30 +1,9 @@ +#!/usr/bin/python + import config -import urllib.parse as parse -import ping3 -import model -import datetime - - -def ping(): - servers = config.get_servers() - execution_datetime = datetime.datetime.now() - print("Ping at {time}".format(time=execution_datetime)) - for server_name in servers: - server = servers[server_name] - url = server["url"] - named_tup = parse.urlparse(url) - netloc = named_tup.netloc - port_loc = netloc.find(":") - if port_loc > 0: - addr = netloc[0:port_loc] - else: - addr = netloc - ping_delay = ping3.ping(addr, timeout=5) * 1000 # in millionsecond - print('Ping delay for {serv} is {ping_val}'.format(serv=server_name,ping_val=ping_delay)) - model.add_ping_record(execution_datetime, server_name, ping_delay) - +import ping if __name__ == "__main__": config.init_config() - ping() - pass + ping.ping() + print("Finished.")