Update merged2upload.py

merged2upload.py

@@ -3,16 +3,37 @@ import base64
 import os
 import time
 import schedule
+import signal
+import sys
+import logging
+from urllib3.exceptions import InsecureRequestWarning
+
+# 配置日志
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+
+# 禁用不安全请求警告
+requests.packages.urllib3.disable_warnings(category=InsecureRequestWarning)
+
+# 全局变量来控制脚本运行
+running = True
+
+def signal_handler(signum, frame):
+    global running
+    logging.info("Received signal to terminate. Shutting down gracefully...")
+    running = False
+
+signal.signal(signal.SIGINT, signal_handler)
+signal.signal(signal.SIGTERM, signal_handler)
 
 def fetch_and_decode_base64(url):
-    print(url)
+    logging.info(f"Fetching: {url}")
     try:
-        response = requests.get(url, verify=False)
+        response = requests.get(url, verify=False, timeout=30)
         response.raise_for_status()
         decoded_content = base64.b64decode(response.text)
         return decoded_content.decode('utf-8')
     except requests.RequestException as e:
-        print(f"Error fetching {url}: {e}")
+        logging.error(f"Error fetching {url}: {e}")
         return None
 
 def upload_to_gist(content, gist_id, github_token):
@@ -29,23 +50,42 @@ def upload_to_gist(content, gist_id, github_token):
         }
     }
     try:
-        response = requests.patch(url, headers=headers, json=data)
+        response = requests.patch(url, headers=headers, json=data, timeout=30)
         response.raise_for_status()
-        print(f"Successfully updated Gist: {gist_id}")
+        logging.info(f"Successfully updated Gist: {gist_id}")
     except requests.RequestException as e:
-        print(f"Error updating Gist: {e}")
+        logging.error(f"Error updating Gist: {e}")
+
+def run_collect_script():
+    logging.info("Running collect.py script...")
+    try:
+        os.system("cd /app/aggregator && python -u subscribe/collect.py -si")
+        logging.info("collect.py script completed successfully")
+    except Exception as e:
+        logging.error(f"Error running collect.py script: {e}")
+        return False
+    return True
 
 def run_task():
-    print("执行任务...")
-    
-    # 运行 collect.py
-    os.system("cd /app/aggregator && python -u subscribe/collect.py -si")
+    logging.info("Starting task execution...")
     
+    if not run_collect_script():
+        logging.warning("Failed to run collect.py, skipping this task execution")
+        return
+
     file_path = '/app/aggregator/data/subscribes.txt'
+    
+    if not os.path.exists(file_path):
+        logging.warning(f"File {file_path} does not exist, skipping this task execution")
+        return
 
     with open(file_path, 'r') as file:
         urls = file.read().strip().split('\n')
 
+    if not urls:
+        logging.warning("subscribes.txt is empty, skipping this task execution")
+        return
+
     all_decoded_texts = []
 
     for url in urls:
@@ -53,31 +93,35 @@ def run_task():
         if decoded_content:
             all_decoded_texts.append(decoded_content)
 
+    if not all_decoded_texts:
+        logging.warning("No content was successfully decoded, skipping this task execution")
+        return
+
     merged_content = "\n".join(all_decoded_texts)
     encoded_merged_content = base64.b64encode(merged_content.encode('utf-8')).decode('utf-8')
 
     merged_file_path = '/app/aggregator/data/merged.txt'
     with open(merged_file_path, 'w') as file:
         file.write(encoded_merged_content)
-        print(f"Encoded merged content written to {merged_file_path}")
+        logging.info(f"Encoded merged content written to {merged_file_path}")
 
-    # Upload the merged content to the Gist
     github_token = os.getenv('GITHUB_TOKEN')
     gist_id = os.getenv('GITHUB_GIST_ID')
     upload_to_gist(encoded_merged_content, gist_id, github_token)
     
-    print("任务完成")
+    logging.info("Task execution completed")
 
 def main():
-    # 立即运行一次任务
+    logging.info("Script started")
     run_task()
     
-    # 设置每6小时运行一次任务
     schedule.every(6).hours.do(run_task)
     
-    while True:
+    while running:
         schedule.run_pending()
         time.sleep(1)
 
+    logging.info("Script terminated")
+
 if __name__ == "__main__":
     main()