diff --git a/0001-modify-uwsgi-configuration-file-fields.patch b/0001-modify-uwsgi-configuration-file-fields.patch deleted file mode 100644 index 71d2144d5b9dbed4764679bba66a9b9fd1ff6c8c..0000000000000000000000000000000000000000 --- a/0001-modify-uwsgi-configuration-file-fields.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e48ee859dcc753fec77e23c465019f0d1572f36a Mon Sep 17 00:00:00 2001 -From: wenxin -Date: Tue, 27 Dec 2022 11:09:06 +0800 -Subject: [PATCH] Modify uwsgi configuration file fields - ---- - aops-vulcanus | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/aops-vulcanus b/aops-vulcanus -index 78a43a8..368c57f 100644 ---- a/aops-vulcanus -+++ b/aops-vulcanus -@@ -40,6 +40,8 @@ function create_config_file() { - daemonize=$(get_config "${config_file}" "uwsgi" "daemonize") - http_timeout=$(get_config "${config_file}" "uwsgi" "http-timeout") - harakiri=$(get_config "${config_file}" "uwsgi" "harakiri") -+ processes=$(get_config "${config_file}" "uwsgi" "processes") -+ threads=$(get_config "${config_file}" "uwsgi" "threads") - - check_file $daemonize - echo "[INFO] run ${service_name} under path: ${wsgi_file}" -@@ -63,6 +65,9 @@ pidfile=${OUT_PATH}/${service_name}.pid - callable=app - http-timeout=${http_timeout} - harakiri=${harakiri} -+threads=${threads} -+processes=${processes} -+lazy-apps=true - daemonize=${daemonize}" >"${OUT_PATH}"/"${service_name}".ini - chown root: ${OUT_PATH}/"${service_name}".ini - chmod 750 ${OUT_PATH}/"${service_name}".ini --- -Gitee - diff --git a/aops-vulcanus-v1.1.1.tar.gz b/aops-vulcanus-v1.1.1.tar.gz deleted file mode 100644 index 0c2c8b037d8cbda84e13cc0dbc7fc3e748d97abf..0000000000000000000000000000000000000000 Binary files a/aops-vulcanus-v1.1.1.tar.gz and /dev/null differ diff --git a/aops-vulcanus-v1.2.0.tar.gz b/aops-vulcanus-v1.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cf87863606b366629207080489541ddd344868b5 Binary files /dev/null and b/aops-vulcanus-v1.2.0.tar.gz differ diff --git a/aops-vulcanus.spec b/aops-vulcanus.spec index e1256440dd105d66654247b71a739ea1782cb5e2..af88331a892e6bd454ee2e46f7fb0c9f3dcc4e78 100644 --- a/aops-vulcanus.spec +++ b/aops-vulcanus.spec @@ -1,17 +1,17 @@ Name: aops-vulcanus -Version: v1.1.1 -Release: 2 +Version: v1.2.0 +Release: 1 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-modify-uwsgi-configuration-file-fields.patch BuildRequires: python3-setuptools Requires: python3-concurrent-log-handler python3-xmltodict python3-pyyaml python3-marshmallow >= 3.13.0 Requires: python3-requests python3-xlrd python3-prettytable python3-pygments python3-sqlalchemy Requires: python3-elasticsearch >= 7 python3-prometheus-api-client python3-urllib3 python3-werkzeug Requires: python3-flask python3-flask-restful python3-PyMySQL python3-kafka-python +Requires: python-jwt python-redis Provides: aops-vulcanus Conflicts: aops-utils @@ -29,7 +29,7 @@ tools for aops, it's about aops deploy %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} # build for aops-vulcanus @@ -48,6 +48,7 @@ cp -r scripts %{buildroot}/opt/aops/ %files %doc README.* %attr(0644,root,root) %{_sysconfdir}/aops/system.ini +%attr(0640,root,root) %{_sysconfdir}/aops/.aops-private-config.ini %{python3_sitelib}/aops_vulcanus*.egg-info %{python3_sitelib}/vulcanus/* %attr(0755,root,root) %{_bindir}/aops-vulcanus @@ -58,11 +59,15 @@ cp -r scripts %{buildroot}/opt/aops/ %changelog +* Mon Apr 17 2023 wenixn - v1.2.0-1 +- update token authentication method; update the structure of response body +- update database connect method + * Tue Dec 27 2022 wenxin - v1.1.1-2 - Modify uwsgi configuration file fields * Fri Dec 02 2022 wenxin - v1.1.1-1 -- update get response +- update get response * Fri Nov 25 2022 wenxin - v1.1.0-1 - Fix bug: fix file creation error