From 75a41a70a9fc8d1ee78edbf6011aeee4b4d42f9d Mon Sep 17 00:00:00 2001 From: wenxin Date: Thu, 8 Jun 2023 20:40:46 +0800 Subject: [PATCH] fix issue: zeus load failed when fisrt start --- 0001-add-paging-parameter-schema.patch | 41 +++++++++++++++++++ ...euwsgi-conf-file-generation-function.patch | 24 +++++++++++ aops-vulcanus.spec | 10 ++++- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 0001-add-paging-parameter-schema.patch create mode 100644 0002-updateuwsgi-conf-file-generation-function.patch diff --git a/0001-add-paging-parameter-schema.patch b/0001-add-paging-parameter-schema.patch new file mode 100644 index 0000000..6c0ea29 --- /dev/null +++ b/0001-add-paging-parameter-schema.patch @@ -0,0 +1,41 @@ +From db18901aae967d1bf6b26a751d25a8f63eba7c2d Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Wed, 7 Jun 2023 16:35:22 +0800 +Subject: [PATCH] add paging parameter schema + +--- + vulcanus/restful/serialize/validate.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/vulcanus/restful/serialize/validate.py b/vulcanus/restful/serialize/validate.py +index 1c00804..0e5c6ea 100644 +--- a/vulcanus/restful/serialize/validate.py ++++ b/vulcanus/restful/serialize/validate.py +@@ -16,7 +16,8 @@ Author: + Description: + """ + import re +-from marshmallow import ValidationError ++ ++from marshmallow import Schema, ValidationError, fields + + + def validate(verifier, data, load=False): +@@ -72,4 +73,12 @@ class ValidateRules: + validation rules for password, which only contains string or number + """ + if not re.findall("[a-zA-Z0-9]{6,20}", string): +- raise ValidationError("password should only contains string or number, between 6 and 20 characters!!") +\ No newline at end of file ++ raise ValidationError("password should only contains string or number, between 6 and 20 characters!!") ++ ++ ++class PaginationSchema(Schema): ++ """ ++ filter schema of paging parameter ++ """ ++ page = fields.Integer(required=False, validate=lambda s: 10**6 > s > 0) ++ per_page = fields.Integer(required=False, validate=lambda s: 10**3 > s > 0) +-- +Gitee + diff --git a/0002-updateuwsgi-conf-file-generation-function.patch b/0002-updateuwsgi-conf-file-generation-function.patch new file mode 100644 index 0000000..6069f4a --- /dev/null +++ b/0002-updateuwsgi-conf-file-generation-function.patch @@ -0,0 +1,24 @@ +From af4cb1a8f4b898e94d67020a7425d781e28013f5 Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Mon, 5 Jun 2023 23:48:03 +0800 +Subject: [PATCH] update uwsgi.ini generation function + +--- + aops-vulcanus | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/aops-vulcanus b/aops-vulcanus +index dea2b61..ce63dbd 100644 +--- a/aops-vulcanus ++++ b/aops-vulcanus +@@ -67,7 +67,6 @@ callable=app + http-timeout=${http_timeout} + harakiri=${harakiri} + processes=${processes} +-lazy-apps=true + daemonize=${daemonize}" >"${OUT_PATH}"/"${service_name}".ini + if [ ${gevent} ] + then +-- +Gitee + diff --git a/aops-vulcanus.spec b/aops-vulcanus.spec index a1b77df..c712efa 100644 --- a/aops-vulcanus.spec +++ b/aops-vulcanus.spec @@ -1,10 +1,12 @@ Name: aops-vulcanus Version: v1.2.1 -Release: 1 +Release: 2 Summary: A basic tool libraries of aops, including logging, configure and response, etc. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-add-paging-parameter-schema.patch +Patch0002: 0002-updateuwsgi-conf-file-generation-function.patch BuildRequires: python3-setuptools @@ -30,7 +32,7 @@ tools for aops, it's about aops deploy %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 # build for aops-vulcanus @@ -60,6 +62,10 @@ cp -r scripts %{buildroot}/opt/aops/ %changelog +* Thu Jun 08 2023 wenxin - v1.2.1-2 +- fix issue: aops-zeus app failed to load when first start by uwsgi +- add paging parameter schema + * Tue May 23 2023 wenxin - v1.2.1-1 - add cve rollback url for aops-zeus -- Gitee