From 22fa38525f62166072982f0912d93618f3369091 Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Fri, 26 Jul 2024 10:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=85=A7=E7=89=87=E8=AF=86=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6=E4=BE=9D=E9=9D=A0docker?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 photo_mask.py            |  2 +-
 photo_review.py          | 45 ++++++++++++++++++++--------------------
 photo_review/__init__.py |  2 --
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/photo_mask.py b/photo_mask.py
index e42987e..ab8c100 100644
--- a/photo_mask.py
+++ b/photo_mask.py
@@ -36,4 +36,4 @@ if __name__ == '__main__':
         error_logger = logging.getLogger("error")
         error_logger.error(traceback.format_exc())
         if SEND_ERROR_EMAIL:
-            send_error_email(program_name=program_name, error_name=repr(e), error_detail=traceback.format_exc())
+            send_error_email(program_name, repr(e), traceback.format_exc())
diff --git a/photo_review.py b/photo_review.py
index 3ed5340..8b19398 100644
--- a/photo_review.py
+++ b/photo_review.py
@@ -9,33 +9,32 @@ from auto_email.error_email import send_error_email
 from db import MysqlSession
 from db.mysql import ZxPhhd
 from log import LOGGING_CONFIG
-from photo_review import photo_review, SEND_ERROR_EMAIL, RETRY_TIME
+from photo_review import photo_review, SEND_ERROR_EMAIL
 
 # 项目必须从此处启动，否则代码中的相对路径可能导致错误的发生
 if __name__ == '__main__':
     program_name = '照片审核自动识别脚本'
     logging.config.dictConfig(LOGGING_CONFIG)
 
-    for i in range(RETRY_TIME + 1):
-        parser = argparse.ArgumentParser()
-        parser.add_argument("--clean", default=False, type=bool, help="是否将识别中的案子改为待识别状态")
-        args = parser.parse_args()
-        if args.clean or i > 0:
-            # 主要用于启动时，清除仍在涂抹中的案子
-            session = MysqlSession()
-            update_flag = (update(ZxPhhd).where(ZxPhhd.exsuccess_flag == "2").values(exsuccess_flag="1"))
-            session.execute(update_flag)
-            session.commit()
-            session.close()
-            logging.info("已释放残余的识别案子！")
-        else:
-            sleep(5)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--clean", default=False, type=bool, help="是否将识别中的案子改为待识别状态")
+    args = parser.parse_args()
+    if args.clean:
+        # 主要用于启动时，清除仍在涂抹中的案子
+        session = MysqlSession()
+        update_flag = (update(ZxPhhd).where(ZxPhhd.exsuccess_flag == "2").values(exsuccess_flag="1"))
+        session.execute(update_flag)
+        session.commit()
+        session.close()
+        logging.info("已释放残余的识别案子！")
+    else:
+        sleep(5)
 
-        try:
-            logging.info(f"【{program_name}】开始运行")
-            photo_review.main()
-        except Exception as e:
-            error_logger = logging.getLogger('error')
-            error_logger.error(traceback.format_exc())
-            if SEND_ERROR_EMAIL:
-                send_error_email(program_name, repr(e), traceback.format_exc())
+    try:
+        logging.info(f"【{program_name}】开始运行")
+        photo_review.main()
+    except Exception as e:
+        error_logger = logging.getLogger('error')
+        error_logger.error(traceback.format_exc())
+        if SEND_ERROR_EMAIL:
+            send_error_email(program_name, repr(e), traceback.format_exc())
diff --git a/photo_review/__init__.py b/photo_review/__init__.py
index 03f605f..59bcf9b 100644
--- a/photo_review/__init__.py
+++ b/photo_review/__init__.py
@@ -9,8 +9,6 @@ HOSTNAME = socket.gethostname()
 """
 项目配置
 """
-# 项目奔溃的重试次数
-RETRY_TIME = 1
 # 每次从数据库获取的案子数量
 PHHD_BATCH_SIZE = 10
 # 没有查询到案子的等待时间(分钟)