diff --git a/0010-fix-restart-due-to-redis-config-error.patch b/0010-fix-restart-due-to-redis-config-error.patch new file mode 100644 index 0000000..351e2a7 --- /dev/null +++ b/0010-fix-restart-due-to-redis-config-error.patch @@ -0,0 +1,18 @@ +From 89958aea1e373aae9298ca5b41be5ed44b09f840 Mon Sep 17 00:00:00 2001 +From: liheavy +Date: Tue, 29 Nov 2022 18:00:10 +0800 +Subject: [PATCH] fix restart due to redis + +diff -Nur a/packageship/pkgshipd b/packageship/pkgshipd +--- a/packageship/pkgshipd 2022-11-29 16:46:36.425308950 +0800 ++++ b/packageship/pkgshipd 2022-11-29 16:48:17.235065339 +0800 +@@ -355,7 +355,8 @@ + python_command="import redis + try: + response = redis.Redis(host='$redis_ip', +- port="$redis_port") ++ port="$redis_port", ++ socket_timeout=3) + print(response.ping()) + except Exception: + print(False)" diff --git a/pkgship.spec b/pkgship.spec index c1c5644..a818208 100755 --- a/pkgship.spec +++ b/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship Version: 2.2.0 -Release: 9 +Release: 10 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so on. License: Mulan 2.0 URL: https://gitee.com/openeuler/pkgship @@ -14,6 +14,7 @@ Patch0006: 0006-update-copyright.patch Patch0007: 0007-update-readme-about-docker.patch Patch0008: 0008-fix-simplejson-question.patch Patch0009: 0009-delete-terminal-fix-build-failed.patch +Patch0010: 0010-fix-restart-due-to-redis-config-error.patch BuildArch: noarch @@ -119,6 +120,9 @@ create_dir_file /var/log/pkgship-operation 700 d %attr(0640,pkgshipuser,pkgshipuser) /lib/systemd/system/pkgship.service %changelog +* Tue Nov 29 2022 Haiwei Li - 2.2.0-10 +- Fixed the problem that the service keeps restarting due to a redis configuration problem. + * Sun Jan 9 2022 Haiwei Li - 2.2.0-9 - TerminalTable class Use the deprecated method of PrettyTable, resulting in compilation failure, delete the file.