From 098a7fd263c41f606a6e053ccda99b94a2342665 Mon Sep 17 00:00:00 2001 From: rabbitali Date: Thu, 11 May 2023 12:24:38 +0800 Subject: [PATCH] optimize register func (cherry picked from commit d90e37c22f8b2c73867e67b14d349f870e55ac3a) --- 0003-optimize-register-func.patch | 32 +++++++++++++++++++++++++++++++ aops-ceres.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0003-optimize-register-func.patch diff --git a/0003-optimize-register-func.patch b/0003-optimize-register-func.patch new file mode 100644 index 0000000..2cb82ff --- /dev/null +++ b/0003-optimize-register-func.patch @@ -0,0 +1,32 @@ +From e627084922fdead376e16cfc05b555f2d2b114ea Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Mon, 8 May 2023 11:24:25 +0800 +Subject: [PATCH] optimize register func + +--- + ceres/function/command.py | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/ceres/function/command.py b/ceres/function/command.py +index d84177e..e9bb25e 100644 +--- a/ceres/function/command.py ++++ b/ceres/function/command.py +@@ -47,14 +47,12 @@ def register_on_manager(args: argparse.Namespace) -> NoReturn: + Returns: + NoReturn + """ +- if args.data: ++ if args.data is not None: + register_info = register_info_to_dict(args.data) + else: + register_info = get_dict_from_file(args.path) +- if register_info.get('ceres_host') is not None: +- update_ini_data_value(CERES_CONFIG_PATH, +- 'ceres', 'port', register_info.get('ceres_host')) +- if register(register_info) == SUCCESS: ++ ++ if register_info and register(register_info) == SUCCESS: + print('Register Success') + else: + print('Register Fail') +-- diff --git a/aops-ceres.spec b/aops-ceres.spec index 00e36ca..713b7e1 100644 --- a/aops-ceres.spec +++ b/aops-ceres.spec @@ -1,12 +1,14 @@ Name: aops-ceres Version: v1.2.0 -Release: 3 +Release: 4 Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz Patch0001: 0001-fix-shell-command-return-error-and-update-register-function.patch Patch0002: 0002-fix-hotpatch-fail-show-succeed-bug.patch +Patch0003: 0003-optimize-register-func.patch + BuildRequires: python3-setuptools Requires: python3-requests python3-jsonschema python3-libconf @@ -41,6 +43,9 @@ An agent which needs to be adopted in client, it managers some plugins, such as %changelog +* Thu May 11 2023 wenixn - v1.2.0-4 +- fix hotpatch fail show succeed bug + * Tue May 9 2023 ptyang<1475324955@qq.com> - v1.2.0-3 - fix hotpatch fail show succeed bug