shancx 1.9.33.162__tar.gz → 1.9.33.165__tar.gz

{shancx-1.9.33.162 → shancx-1.9.33.165}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shancx
-Version: 1.9.33.162
+Version: 1.9.33.165
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx

{shancx-1.9.33.162 → shancx-1.9.33.165}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 setup(
     name="shancx",
-    version="1.9.33.162",
+    version="1.9.33.165",
     packages=find_packages(),
     description="A simple timer decorator",
     long_description=open("README.md").read(),

{shancx-1.9.33.162 → shancx-1.9.33.165}/shancx/NN/__init__.py

@@ -11,11 +11,11 @@ __author_email__ = 'shancx@126.com'
 # @Time : 2023/09/27 下午8:52
 # @Author : shanchangxi
 # @File : util_log.py
-
 import logging
 from logging.handlers import RotatingFileHandler
 import os
-def _loggers(logger_name="loggers", root="./logs", phase="project", level=logging.INFO, screen=True, max_bytes=10*1024*1024, backup_count=5, overwrite=False,handlersflag=False):
+from shancx import crDir 
+def _loggers(logger_name="loggers", root="./logs", phase="project", level=logging.INFO, screen=True, max_bytes=10*1024*1024, backup_count=5, overwrite=False,handlersflag=True):
     '''set up logger with rotating file handler'''
     l = logging.getLogger(logger_name)
     if handlersflag:
@@ -24,9 +24,7 @@ def _loggers(logger_name="loggers", root="./logs", phase="project", level=loggin
     formatter = logging.Formatter(
         "%(asctime)s - %(filename)s[line:%(lineno)d] - %(levelname)s: %(message)s", datefmt='%Y-%m-%d %H:%M:%S') 
     log_file = os.path.join(root, '{}.log'.format(phase))
-    log_dir = os.path.dirname(log_file)
-    if not os.path.exists(log_dir):
-        os.makedirs(log_dir, exist_ok=True)
+    crDir(log_file)
     # Use RotatingFileHandler with 'w' mode to overwrite log file if needed
     mode = 'w' if overwrite else 'a'
     fh = RotatingFileHandler(log_file, mode=mode, maxBytes=max_bytes, backupCount=backup_count)
@@ -66,30 +64,30 @@ if __name__ == "__main__":
     logger.info("这是一条INFO日志")
 '''
 
-import os
-from datetime import datetime
-from shancx.NN import _loggers
-from shancx import lock_file
-from shancx.wait import check_lock
-from shancx import crDir
-logger =_loggers()
-def check_process_data(UTC, sat_cd,basepath ="/mnt/wtx_weather_forecast/scx/test/lock_files" ): 
-    try:
-        UTCStr = UTC.strftime("%Y%m%d%H%M")
-        file = f"/mnt/wtx_weather_forecast/scx/test/lock_files/{sat_cd}/{UTCStr[:4]}/{UTCStr[:8]}/File_{UTCStr}.lock"
-        crDir(file)
-        if not lock_file(file):
-            if check_lock(file):
-                logger.info("data is making or maked")
-                return True ,file       
-        return False,file        
-    except Exception as e:
-        logger.error(f"Error in check_and_process_data: {str(e)}")
-        return False,file  
-"""
-flag1,file = check_process_data(UTC, "H9SEAS" )
-if flag1:
-    sys.exit() 
-if os.path.exists(output_path): #配合使用
-   sys.exit()    
-"""
+# import os
+# from datetime import datetime
+# from shancx.NN import _loggers
+# from shancx import lock_file
+# from shancx.wait import check_lock
+# from shancx import crDir
+# logger =_loggers()
+# def check_process_data(UTC, sat_cd,basepath ="/mnt/wtx_weather_forecast/scx/test/lock_files" ): 
+#     try:
+#         UTCStr = UTC.strftime("%Y%m%d%H%M")
+#         file = f"/mnt/wtx_weather_forecast/scx/test/lock_files/{sat_cd}/{UTCStr[:4]}/{UTCStr[:8]}/File_{UTCStr}.lock"
+#         crDir(file)
+#         if not lock_file(file):
+#             if check_lock(file):
+#                 logger.info("data is making or maked")
+#                 return True ,file       
+#         return False,file        
+#     except Exception as e:
+#         logger.error(f"Error in check_and_process_data: {str(e)}")
+#         return False,file  
+# """
+# flag1,file = check_process_data(UTC, "H9SEAS" )
+# if flag1:
+#     sys.exit() 
+# if os.path.exists(output_path): #配合使用
+#    sys.exit()    
+# """

{shancx-1.9.33.162 → shancx-1.9.33.165}/shancx/__init__.py

@@ -346,12 +346,12 @@ from pathlib import Path
 def lock_file(lock_file_path):
     if os.path.exists(lock_file_path):
         print(f" {lock_file_path} is existded ")
-        return True
+        return False
     try:
         os.makedirs(os.path.dirname(lock_file_path), exist_ok=True)
         with open(lock_file_path, 'w') as f:
             f.write(f"process_id:{os.getpid()},create_time:{datetime.datetime.now()}")
-            return False
+            return True 
     except Exception as e:
         print(f"创建锁文件失败 create lock failed : {e}")
         return False
@@ -364,7 +364,39 @@ if os.path.exists(lock_file):
     print(f"锁文件存在，已有程序在处理时次 {utc_time_str}，跳过")
     return False 
 """
- 
+import os
+import time
+def is_process_alive(pid):
+    try:
+        os.kill(pid, 0)  
+        return True
+    except OSError:
+        return False
+def check_lock(lock_file):
+    if not os.path.exists(lock_file):
+        return False    
+    try:
+        with open(lock_file, 'r') as f:
+            content = f.read().strip()        
+        if 'process_id:' in content and 'create_time:' in content:
+            pid_str = content.split('process_id:')[1].split(',')[0]
+            pid = int(pid_str)            
+            if not is_process_alive(pid):
+                print(f"进程 {pid} 已消亡，清理锁文件")
+                os.remove(lock_file)
+                return False 
+            else:
+                print(f"进程 {pid} 仍在运行，跳过执行")
+                return True                
+    except Exception as e:
+        print(f"锁文件解析错误，清理: {e}")
+        os.remove(lock_file)
+        return False    
+    return False
+"""
+if  check_lock(lock_file):
+    return False
+"""
 import multiprocessing
 import sys
 from typing import Optional, Literal

{shancx-1.9.33.162 → shancx-1.9.33.165}/shancx/wait.py

@@ -167,8 +167,7 @@ def is_process_alive(pid):
         return False
 def check_lock(lock_file):
     if not os.path.exists(lock_file):
-        logger.info(f"{lock_file} not exists error A lock file needs to be created. ")
-        return False
+        return False    
     try:
         with open(lock_file, 'r') as f:
             content = f.read().strip()        
@@ -176,12 +175,14 @@ def check_lock(lock_file):
             pid_str = content.split('process_id:')[1].split(',')[0]
             pid = int(pid_str)            
             if not is_process_alive(pid):
+                print(f"进程 {pid} 已消亡，清理锁文件")
                 os.remove(lock_file)
                 return False 
             else:
+                print(f"进程 {pid} 仍在运行，跳过执行")
                 return True                
     except Exception as e:
-        print(f"lock anaylysis error,clean : {e}")
+        print(f"锁文件解析错误，清理: {e}")
         os.remove(lock_file)
         return False    
     return False

{shancx-1.9.33.162 → shancx-1.9.33.165}/shancx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shancx
-Version: 1.9.33.162
+Version: 1.9.33.165
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx