Update app.py

app.py

@@ -1,6 +1,7 @@
 from asyncio import Queue, create_task, gather, sleep
 from contextlib import asynccontextmanager
 from json import dumps, loads
+from logging import INFO, basicConfig, getLogger
 from pathlib import Path
 from typing import Literal
 
@@ -10,12 +11,24 @@ from fastapi.responses import JSONResponse, PlainTextResponse
 from proxybroker import Broker
 from uvicorn import run as uvicorn_run
 
+
 scheduler = AsyncIOScheduler()
+
 try:
     workdir = Path(__file__).parent
 except:
     workdir = Path.cwd().parent
 
+logfile = workdir / 'log.log'
+
+basicConfig(
+    level=INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    filename=str(logfile),
+    filemode='a'
+)
+logger = getLogger('proxy_collector')
+
 is_first_run = True
 
 http_collected_json = workdir / 'http_proxies.json'
@@ -95,19 +108,23 @@ async def stop_broker_after_timeout(broker: Broker, timeout_minutes: int):
 
 
 async def find_proxies_by_type(proxy_type: Literal['HTTP', 'HTTPS', 'SOCKS5'], output_json_file: Path, timeout_minutes: int = 50):
+    logger.info(f'начат сбор прокси {proxy_type}')
     output_json_file.write_text(dumps({'countries': None, 'proxies': []}, indent=4))
     proxies_queue = Queue()
-    broker = Broker(proxies_queue, timeout=2, max_conn=200, max_tries=3, verify_ssl=True if proxy_type != 'HTTPS' else False)
+    broker = Broker(proxies_queue, timeout=8, max_conn=200, max_tries=3, verify_ssl=False)
     stop_task = create_task(stop_broker_after_timeout(broker, timeout_minutes))
     await broker.find(types=[proxy_type], countries=countries_list, limit=0)
     await stop_task
     proxies_list = await collect_proxies(proxies_queue)
-    return create_json_from_proxies(proxies_list, output_json_file)
+    saved_proxy =  create_json_from_proxies(proxies_list, output_json_file)
+    logger.info(f'завершён сбор прокси {proxy_type}')
+    return saved_proxy
 
 
 async def find_proxies():
     global is_first_run
     timeout_minutes = 10 if is_first_run else 50
+    logger.info(f'запущены задачи по сбору всех типов прокси')
     results = await gather(
         find_proxies_by_type('HTTP', http_collected_json, timeout_minutes),
         find_proxies_by_type('HTTPS', https_collected_json, timeout_minutes),
@@ -115,6 +132,7 @@ async def find_proxies():
     )
     await sort_proxies_and_merge(list(results), collected_json)
     is_first_run = False
+    logger.info(f'задачи по сбору прокси завершены')
 
 
 scheduler.add_job(find_proxies, 'interval', max_instances=1, minutes=60)
@@ -173,6 +191,14 @@ async def get_socks5_proxies():
         return not_redy_yet()
 
 
+@app.get('/log/')
+async def get_logs():
+    if logfile.exists():
+        return PlainTextResponse(logfile.read_text(encoding='utf-8'), status_code=200)
+    else:
+        return PlainTextResponse('лог пуст', status_code=200)
+
+
 @app.get('/')
 async def read_root():
     return PlainTextResponse('ну пролапс, ну и что', status_code=200)