fixed 改变清除内存策略

woytu · woytu · commit 76f8a7761055 · 2020-01-04T19:50:02.000+08:00
diff --git a/Pexels.py b/Pexels.py
@@ -8,18 +8,16 @@
 # @Package: 
 # @Software: PyCharm
 import asyncio
-import gc
 import os
 import re
 import threading
 import time
 
-import psutil
 import zhconv
 from bs4 import BeautifulSoup
 
 import Constants
-from utils import ReptileUtil, HttpUtil, ThreadPool, DatabaseUtil, FileUtil
+from utils import HttpUtil, DatabaseUtil, FileUtil, SystemUtil
 
 s3 = DatabaseUtil.Sqlite3(os.path.join(Constants.DATA_PATH, "pexels"))
 
@@ -28,7 +26,7 @@
 
 def download_latest_images(page, directory):
     try:
-        wait()
+        SystemUtil.restart_process(os.path.abspath(__file__))
 
         html = BeautifulSoup(HttpUtil.get("https://www.pexels.com/zh-cn/new-photos?page=" + str(page)).text,
                              features="lxml")
@@ -92,19 +90,6 @@ def download_latest_images(page, directory):
         download_latest_images(page, directory)
 
 
-def wait():
-    if psutil.virtual_memory().percent >= 80:
-        print('内存使用：', psutil.Process(os.getpid()).memory_info().rss)
-        print("当前内存占用率：", psutil.virtual_memory().percent)
-        print("垃圾回收机制是否打开:", gc.isenabled())
-        # 释放内存
-        gc.collect()
-        print('内存使用：', psutil.Process(os.getpid()).memory_info().rss)
-        print("当前内存占用率：", psutil.virtual_memory().percent)
-    if psutil.virtual_memory().percent >= 80:
-        wait()
-
-
 async def run_command(directory):
     threading.Timer(21600, run_command).start()
     dir_size = FileUtil.count_dir_size(directory)
diff --git a/Wallhaven.py b/Wallhaven.py
@@ -8,17 +8,15 @@
 # @Package: 
 # @Software: PyCharm
 import asyncio
-import gc
 import os
 import re
 import threading
 import time
 
-import psutil
 from bs4 import BeautifulSoup
 
 import Constants
-from utils import ReptileUtil, HttpUtil, ThreadPool, DatabaseUtil, TranslationUtil, FileUtil
+from utils import HttpUtil, DatabaseUtil, TranslationUtil, FileUtil, SystemUtil
 
 s3 = DatabaseUtil.Sqlite3(os.path.join(Constants.DATA_PATH, "wallhaven"))
 
@@ -34,7 +32,7 @@ def download_images(url, page, directory):
     :return:
     """
     try:
-        wait()
+        SystemUtil.restart_process(os.path.abspath(__file__))
 
         html = BeautifulSoup(HttpUtil.get(url + str(page)).text, features="lxml")
         figure = html.find_all("figure")
@@ -141,23 +139,6 @@ def get_tag(page):
         get_tag(page + 1)
 
 
-def wait():
-    """
-    垃圾回收
-    :return:
-    """
-    if psutil.virtual_memory().percent >= 80:
-        print('内存使用：', psutil.Process(os.getpid()).memory_info().rss)
-        print("当前内存占用率：", psutil.virtual_memory().percent)
-        print("垃圾回收机制是否打开:", gc.isenabled())
-        # 释放内存
-        gc.collect()
-        print('内存使用：', psutil.Process(os.getpid()).memory_info().rss)
-        print("当前内存占用率：", psutil.virtual_memory().percent)
-    if psutil.virtual_memory().percent >= 80:
-        wait()
-
-
 async def run_command(directory):
     threading.Timer(3600, run_command).start()
     dir_size = FileUtil.count_dir_size(directory)
diff --git a/utils/SystemUtil.py b/utils/SystemUtil.py
@@ -8,10 +8,13 @@
 # @Package: 
 # @Software: PyCharm
 import ctypes
+import gc
+import os
+import platform
 import sys
 from subprocess import call
-from pip._internal.utils.misc import get_installed_distributions
-import pkg_resources
+
+import psutil
 
 
 def check_version():
@@ -33,6 +36,8 @@ def update_lib():
     更新依赖方式一
     :return:
     """
+    from pip._internal.utils.misc import get_installed_distributions
+
     packages = [dist.project_name for dist in get_installed_distributions()]
     call("pip install --upgrade" + ' '.join(packages), shell=True)
 
@@ -42,6 +47,8 @@ def update_lib_two():
     更新依赖方式二
     :return:
     """
+    import pkg_resources
+
     packages = [dist.project_name for dist in pkg_resources.working_set]
     call("pip install --upgrade" + ' '.join(packages), shell=True)
 
@@ -127,5 +134,28 @@ def update_fire_wall(key_name='PublicProfile'):
     winreg.CloseKey(regRoot)
 
 
+def restart_process(path):
+    """
+    当内存占用达到一定比例进程重启
+    :param path: 执行脚本的全路径
+    :return:
+    """
+    if psutil.virtual_memory().percent < 80:
+        print('内存使用：', psutil.Process(os.getpid()).memory_info().rss)
+        print("当前内存占用率：", psutil.virtual_memory().percent)
+        # if gc.isenabled():
+        #     # 释放内存
+        #     gc.collect()
+        print("前进程id：", os.getpid(), "父进程id：", os.getppid())
+
+        py = "python3" if (os.system("python3 -V") == 0) else "python"
+        sysstr = platform.system()
+        if sysstr == "Windows":
+            os.system(f"taskkill /pid {os.getpgid()} /f && {py} {path}")
+        elif sysstr == "Linux":
+            os.system(f"kill -9 {os.getpgid()} && {py} {path}")
+
+
 if __name__ == '__main__':
-    print(get_windows_software())
+    # print(get_windows_software())
+    restart_process(os.path.abspath(__file__))
