From bfd9d579d1a5ffa27acd5b8e148fda9ff3fbebd1 Mon Sep 17 00:00:00 2001 From: facat Date: Mon, 17 Jun 2019 22:51:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E5=BD=95=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E6=97=B6=E9=97=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- downloader.py | 4 +++- main.py | 1 - model.py | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/downloader.py b/downloader.py index 9def8c0..4a1bc22 100644 --- a/downloader.py +++ b/downloader.py @@ -18,6 +18,8 @@ def get_servers(): # file_size if byte # longest_time seconds def download_file(chunk_size=4 * 1024, file_size=100 * 1024 * 1024, longest_time=60): + execution_datetime=datetime.datetime.now() + print(execution_datetime) servers = get_servers() for server_name in servers: server = servers[server_name] @@ -43,7 +45,7 @@ def download_file(chunk_size=4 * 1024, file_size=100 * 1024 * 1024, longest_time ) break speed = chunk_read / duration / 1024 / 1024 * 8 # mega bit - model.add_record(server_name, speed) + model.add_record(execution_datetime,server_name, speed) print("{server}:{speed} Mbit/s".format(server=server_name, speed=speed)) except requests.exceptions.Timeout as e: print( diff --git a/main.py b/main.py index 349e376..81d9df7 100644 --- a/main.py +++ b/main.py @@ -6,6 +6,5 @@ import config if __name__ == "__main__": config.init_config() - print(datetime.datetime.now()) downloader.download_file() print("Finished.") diff --git a/model.py b/model.py index 3e4b81c..5ab0850 100644 --- a/model.py +++ b/model.py @@ -6,12 +6,11 @@ mysql_db = MySQLDatabase( ) -def add_record(server, speed): - now = datetime.datetime.now() - now_timestamp = now.strftime("%Y-%m-%d %H:%M:%S") +def add_record(execution_datetime,server, speed): + execution_datetime_timestamp = execution_datetime.strftime("%Y-%m-%d %H:%M:%S") # print(now_timestamp) mysql_db.execute_sql( 'insert into vps_download_speed(server,speed,datetime) values("{server}",{speed},"{datetime}")'.format( - server=server, speed=speed, datetime=now_timestamp + server=server, speed=speed, datetime=execution_datetime_timestamp ) )