!45 update timed task arg check and es repo source url
From: @rabbitali Reviewed-by: @zhu-yuncheng Signed-off-by: @zhu-yuncheng
This commit is contained in:
commit
8b5d0b3204
36
0007-update-timed-task-args-check-and-timeout.patch
Normal file
36
0007-update-timed-task-args-check-and-timeout.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From b45d4895509b85752e62bf97267813f7cc77fec4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rabbitali <wenxin32@foxmail.com>
|
||||||
|
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
|
||||||
|
|
||||||
29
0008-update-es-repo-source-url.patch
Normal file
29
0008-update-es-repo-source-url.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From b2b4644c7dc495313ed13a600c419641e95d8ad3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: heyitao <linuxgcc@163.com>
|
||||||
|
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 <linuxgcc@163.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: aops-vulcanus
|
Name: aops-vulcanus
|
||||||
Version: v1.3.0
|
Version: v1.3.0
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: A basic tool libraries of aops, including logging, configure and response, etc.
|
Summary: A basic tool libraries of aops, including logging, configure and response, etc.
|
||||||
License: MulanPSL2
|
License: MulanPSL2
|
||||||
URL: https://gitee.com/openeuler/%{name}
|
URL: https://gitee.com/openeuler/%{name}
|
||||||
@ -11,6 +11,8 @@ Patch0003: 0003-update-aops-basedatabase.patch
|
|||||||
Patch0004: 0004-fix-information-path-incorrect.patch
|
Patch0004: 0004-fix-information-path-incorrect.patch
|
||||||
Patch0005: 0005-suitable-for-version-2003-sp3.patch
|
Patch0005: 0005-suitable-for-version-2003-sp3.patch
|
||||||
Patch0006: 0006-fix-python3-prometheus-api-client-import-error.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
|
BuildRequires: python3-setuptools
|
||||||
@ -66,6 +68,10 @@ cp -r scripts %{buildroot}/opt/aops/
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 24 2023 wenxin<wenxin32@foxmail.com> - v1.3.0-5
|
||||||
|
- update timed task args check and timeout
|
||||||
|
- update elasticsearch repo source url
|
||||||
|
|
||||||
* Wed Oct 18 2023 gongzhengtang<gong_zhengtang@163.com> - v1.3.0-4
|
* Wed Oct 18 2023 gongzhengtang<gong_zhengtang@163.com> - v1.3.0-4
|
||||||
- it is suitable for version 20.03-LTS-sp3
|
- it is suitable for version 20.03-LTS-sp3
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user