修复部分问题

anjia0532 · May 8, 2024 · fb95284 · fb95284
1 parent 179803d
commit fb95284
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ gateway等网关插件的高扩展性
 ### 通过docker运行
 
 ```bash
-docker run anjia0532/discovery-syncer-python:v2.4.2
+docker run anjia0532/discovery-syncer-python:v2.4.3
 ```
 
 特别的，`-c ` 支持配置远端http[s]的地址，比如读取静态资源的，比如读取nacos的
@@ -181,7 +181,7 @@ docker run -e SYNC_JOB_JSON=job.json \
         -e DEFAULT_USER_EMAIL='discovery-syncer-python@syncer.org'  \
         -e DEFAULT_BASE_DIR='syncer'  \
         -v $(pwd)/job.json:/opt/discovery-syncer/job.json  \
-        anjia0532/discovery-syncer-python-backup:v2.4.2
+        anjia0532/discovery-syncer-python-backup:v2.4.3
 ```
 
 如果用命令行的话

diff --git a/core/lib/logger.py b/core/lib/logger.py
@@ -1,6 +1,6 @@
+import datetime
 import json
 import logging
-import logging
 import os
 import socket
 import sys
@@ -125,15 +125,15 @@ def emit(self, record):
                     f'此次离上次发送钉钉消息时间间隔不足 {self._time_interval} 秒，此次不发送这个钉钉内容： {record.msg}')
 
     def __emit(self, record):
-        data = (DING_TALK_MSG_TEMPLATE or self._msg_template) % record.__dict__
         try:
+            data = (DING_TALK_MSG_TEMPLATE or self._msg_template) % record.__dict__
+            data = data.replace("\\", "\\\\").replace("\\\\n", "\\n").replace("\"", "'")
             # 因为钉钉发送也是使用requests实现的，如果requests调用的urllib3命名空间也加上了钉钉日志，将会造成循环，程序卡住。一般情况是在根日志加了钉钉handler。
             self._remove_urllib_hanlder()
-            resp = requests.post(self._ding_talk_url + self.sign(),
-                                 json=json.loads(data.replace("\\", "\\\\").replace("\\\\n", "\\n")), timeout=(5, 5))
+            resp = requests.post(self._ding_talk_url + self.sign(), json=json.loads(data), timeout=(5, 5))
             very_nb_print(f'钉钉返回 : {resp.text}')
-        except requests.RequestException as e:
-            very_nb_print(f"发送消息给钉钉机器人失败 {e}")
+        except Exception as e:
+            very_nb_print(f"发送消息给钉钉机器人失败,原始消息: {record.msg} {e}")
 
     def __repr__(self):
         level = logging.getLevelName(self.level)

diff --git a/tools/backup.py b/tools/backup.py
@@ -107,7 +107,7 @@ def check_file(file_path):
                 print(
                     f"\n\n下载 {syncer['syncer']}/gateway-api-to-file/{gateway} 到 {config_dir}/{syncer['base_name']} ,status_code={status_code}, status_msg={status_msg}")
                 script_file.write(f"""
-def restore_{job}_{gateway}():
+def restore_{job.replace("-","_")}_{gateway.replace("-","_")}():
     check_file("{job}/{gateway}/{syncer['base_name']}")
     with open("{job}/{gateway}/{syncer['base_name']}", 'r', encoding='UTF-8') as f:
         resp = httpx.put("{syncer['syncer']}/restore/{gateway}", content="\\n".join(f.readlines()),
@@ -132,7 +132,7 @@ def restore_{job}_{gateway}():
             items = restore_job.split("_")
             script_file.write(f"""
     # 还原 {items[1]} 下的 {items[2]}
-    # {restore_job}
+    # {restore_job.replace("-","_")}
     """)
 
     print("执行 python restore.py 还原网关配置")