From 5a1ca80bbb040c27cb0ce1f0d903a0f13af37e79 Mon Sep 17 00:00:00 2001 From: rabbitali Date: Tue, 24 Oct 2023 21:59:08 +0800 Subject: [PATCH] update timed task arg check and es repo source url --- ...te-timed-task-args-check-and-timeout.patch | 36 +++++++++++++++++++ 0008-update-es-repo-source-url.patch | 29 +++++++++++++++ aops-vulcanus.spec | 8 ++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 0007-update-timed-task-args-check-and-timeout.patch create mode 100644 0008-update-es-repo-source-url.patch diff --git a/0007-update-timed-task-args-check-and-timeout.patch b/0007-update-timed-task-args-check-and-timeout.patch new file mode 100644 index 0000000..b5cb79b --- /dev/null +++ b/0007-update-timed-task-args-check-and-timeout.patch @@ -0,0 +1,36 @@ +From b45d4895509b85752e62bf97267813f7cc77fec4 Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Tue, 24 Oct 2023 21:15:46 +0800 +Subject: [PATCH] update timed task args check and timeout + +--- + vulcanus/conf/constant.py | 2 +- + vulcanus/timed.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vulcanus/conf/constant.py b/vulcanus/conf/constant.py +index ef2dbe3..427d949 100644 +--- a/vulcanus/conf/constant.py ++++ b/vulcanus/conf/constant.py +@@ -29,4 +29,4 @@ PRIVATE_INDIVIDUATION_CONFIG = os.path.join(BASE_CONFIG_PATH, ".aops-private-con + + + REFRESH_TOKEN_EXP = 1440 +-TIMEOUT = 600 ++TIMEOUT = 900 +diff --git a/vulcanus/timed.py b/vulcanus/timed.py +index 52874cb..7d31bee 100644 +--- a/vulcanus/timed.py ++++ b/vulcanus/timed.py +@@ -94,7 +94,7 @@ class TimedTask: + LOGGER.error("Wrong trigger parameter for timed tasks : %s.", trigger) + return False + +- if "day_of_week" not in timed or "hour" not in timed: ++ if "day_of_week" not in timed or "hour" not in timed or "minutes" not in timed: + LOGGER.error("Missing required fields when creating scheduled task.") + return False + +-- +2.33.0 + diff --git a/0008-update-es-repo-source-url.patch b/0008-update-es-repo-source-url.patch new file mode 100644 index 0000000..24f43d9 --- /dev/null +++ b/0008-update-es-repo-source-url.patch @@ -0,0 +1,29 @@ +From b2b4644c7dc495313ed13a600c419641e95d8ad3 Mon Sep 17 00:00:00 2001 +From: heyitao +Date: Fri, 20 Oct 2023 09:29:57 +0000 +Subject: [PATCH] update es repo source url +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: heyitao +--- + scripts/deploy/aops-basedatabase.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/deploy/aops-basedatabase.sh b/scripts/deploy/aops-basedatabase.sh +index a8f5898..444f11f 100755 +--- a/scripts/deploy/aops-basedatabase.sh ++++ b/scripts/deploy/aops-basedatabase.sh +@@ -18,7 +18,7 @@ function create_es_repo() { + fi + echo "[aops_elasticsearch] + name=Elasticsearch repository for 7.x packages +-baseurl=https://artifacts.elastic.co/packages/7.x/yum ++baseurl=https://mirrors.tuna.tsinghua.edu.cn/elasticstack/yum/elastic-7.x/ + gpgcheck=1 + gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch + enabled=1 +-- +2.33.0 + diff --git a/aops-vulcanus.spec b/aops-vulcanus.spec index 490da10..af2c804 100644 --- a/aops-vulcanus.spec +++ b/aops-vulcanus.spec @@ -1,6 +1,6 @@ Name: aops-vulcanus Version: v1.3.0 -Release: 4 +Release: 5 Summary: A basic tool libraries of aops, including logging, configure and response, etc. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -11,6 +11,8 @@ Patch0003: 0003-update-aops-basedatabase.patch Patch0004: 0004-fix-information-path-incorrect.patch Patch0005: 0005-suitable-for-version-2003-sp3.patch Patch0006: 0006-fix-python3-prometheus-api-client-import-error.patch +Patch0007: 0007-update-timed-task-args-check-and-timeout.patch +Patch0008: 0008-update-es-repo-source-url.patch BuildRequires: python3-setuptools @@ -66,6 +68,10 @@ cp -r scripts %{buildroot}/opt/aops/ %changelog +* Tue Oct 24 2023 wenxin - v1.3.0-5 +- update timed task args check and timeout +- update elasticsearch repo source url + * Wed Oct 18 2023 gongzhengtang - v1.3.0-4 - it is suitable for version 20.03-LTS-sp3