From dd095d8c553cf11779d27a00063b60e5182d2dfc Mon Sep 17 00:00:00 2001
From: Renzhi <renzhi828@163.com>
Date: Mon, 30 Dec 2019 15:50:18 +0800
Subject: [PATCH] return round trip time when test cdn

---
 agency/cdn_utils.py   | 43 +++++++++++++++++++------------------------
 myUrllib/httpUtils.py |  4 +++-
 run.py                |  3 +--
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/agency/cdn_utils.py b/agency/cdn_utils.py
index 553925f..d0cf821 100644
--- a/agency/cdn_utils.py
+++ b/agency/cdn_utils.py
@@ -1,41 +1,38 @@
 # encoding=utf8
-import datetime
 import operator
 import os
 import asyncio
-import functools
+from concurrent.futures import ThreadPoolExecutor
 from config.urlConf import urls
 
 from myUrllib.httpUtils import HTTPClient
 
 finish_count = 0
 
-def run_in_executor(f):
-    @functools.wraps(f)
-    def inner(*args, **kwargs):
-        loop = asyncio.get_running_loop()
-        return loop.run_in_executor(None, lambda: f(*args, **kwargs))
-
-    return inner
-
 
 def calculate_rtt_blocking(cdn):
     global finish_count
     http = HTTPClient(0)
     url = urls["loginInitCdn"]
     http._cdn = cdn
-    print(f"测试cdn: {cdn}")
-    start_time = datetime.datetime.now()
-    rep = http.send(url)
-    rtt = (datetime.datetime.now() - start_time).microseconds / 1000
+    rtt_dict = {"rtt": 9999}
+    http.send(url, elapsed=rtt_dict)
+    rtt = rtt_dict["rtt"]
     finish_count += 1
-    print(f"测试完成个数: {finish_count}")
-    return {"ip": cdn, "time": rtt} if rep else None
+    # 过滤逻辑为当前cdn响应值小于1000毫秒
+    if rtt < 2000:
+        print(f"ip:{cdn}，延迟:{rtt}，已测试个数: {finish_count}")
+        return {"ip": cdn, "time": rtt}
+    else:
+        print(f"ip:{cdn}，延迟:N/A，已测试个数: {finish_count}")
+        return None
 
 
-@run_in_executor
-def calculate_rtt_async(cdn):
-    return calculate_rtt_blocking(cdn)
+async def calculate_all_rtt_async(cdns, loop, executor):
+    done, pending = await asyncio.wait(fs=[loop.run_in_executor(executor, calculate_rtt_blocking, cdn) for cdn in cdns],
+                                       return_when=asyncio.ALL_COMPLETED)
+    cdn_list = [task.result() for task in done if task.exception() is None and task.result() is not None]
+    return cdn_list
 
 
 def open_cdn_file(cdnFile):
@@ -68,7 +65,7 @@ def sortCdn(cdn_list):
     return ips
 
 
-async def filterCdn():
+def filterCdn():
     """
     过滤cdn, 过滤逻辑为当前cdn响应值小于1000毫秒
     过滤日志:
@@ -76,10 +73,8 @@ async def filterCdn():
     :return:
     """
     cdns = open_cdn_file("cdn_list")
-    cdn_tasks = [calculate_rtt_async(cdn) for cdn in cdns]
-    done, pending = await asyncio.wait(fs=cdn_tasks, return_when=asyncio.ALL_COMPLETED)
-    cdn_list = [task.result() for task in done if task.exception() is None and task.result() is not None]
-
+    loop = asyncio.get_event_loop()
+    cdn_list = loop.run_until_complete(calculate_all_rtt_async(cdns, loop, ThreadPoolExecutor()))
     print(f"当前有效cdn个数为: {len(cdn_list)}")
     if cdn_list:
         ips = sortCdn(cdn_list)
diff --git a/myUrllib/httpUtils.py b/myUrllib/httpUtils.py
index 77b2318..ccceaa0 100755
--- a/myUrllib/httpUtils.py
+++ b/myUrllib/httpUtils.py
@@ -123,7 +123,7 @@ class HTTPClient(object):
     def cdn(self, cdn):
         self._cdn = cdn
 
-    def send(self, urls, data=None, **kwargs):
+    def send(self, urls, data=None, elapsed=None, **kwargs):
         """send request to url.If response 200,return response, else return None."""
         allow_redirects = False
         is_logger = urls.get("is_logger", False)
@@ -173,6 +173,8 @@ class HTTPClient(object):
                                            allow_redirects=allow_redirects,
                                            verify=False,
                                            **kwargs)
+                if is_test_cdn:
+                    elapsed["rtt"] = round(response.elapsed.total_seconds() * 1000, 3)
                 if response.status_code == 200 or response.status_code == 302:
                     if urls.get("not_decode", False):
                         return response.content
diff --git a/run.py b/run.py
index e1826a1..8046362 100755
--- a/run.py
+++ b/run.py
@@ -1,7 +1,6 @@
 # -*- coding=utf-8 -*-
 import argparse
 import sys
-import asyncio
 
 
 def parser_arguments(argv):
@@ -28,5 +27,5 @@ if __name__ == '__main__':
         sendServerChan("订票小助手测试一下")
     elif args.operate == "c":
         from agency.cdn_utils import filterCdn
-        asyncio.run(filterCdn())
+        filterCdn()