!28 pacemaker: Don't add explicit error prefix in log
From: @bizhiyuan Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
commit
3166cea438
@ -24,7 +24,7 @@
|
||||
%bcond_with run_build_tests
|
||||
%bcond_with include_unit_test
|
||||
|
||||
%global release 2
|
||||
%global release 3
|
||||
|
||||
## User and group to use for nonprivileged services (should be in sync with pacemaker)
|
||||
%global uname hacluster
|
||||
@ -49,6 +49,7 @@ License: GPL-2.0-or-later
|
||||
Url: https://github.com/%{github_owner}/%{name}
|
||||
Source0: https://github.com/%{github_owner}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: Remove-const-warning.patch
|
||||
Patch1: pacemaker-Don-t-add-explicit-error-prefix-in-log.patch
|
||||
|
||||
# direct build process dependencies
|
||||
BuildRequires: autoconf
|
||||
@ -297,6 +298,9 @@ VERBOSE=1 make check
|
||||
%{_usr}/lib/ocf/resource.d/booth/sharedrsc
|
||||
|
||||
%changelog
|
||||
* Thu Feb 29 2024 bizhiyuan <bizhiyuan@kylinos.cn> - 1.1-3
|
||||
- pacemaker: Don't add explicit error prefix in log
|
||||
|
||||
* Tue Feb 20 2024 bizhiyuan <bizhiyuan@kylinos.cn> - 1.1-2
|
||||
- pacemaker: Remove const warning
|
||||
|
||||
|
||||
26
pacemaker-Don-t-add-explicit-error-prefix-in-log.patch
Normal file
26
pacemaker-Don-t-add-explicit-error-prefix-in-log.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 26c9509bb96dbabf6bb4155f403944c7c5308cd4 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Friesse <jfriesse@redhat.com>
|
||||
Date: Tue, 24 Oct 2023 16:40:54 +0200
|
||||
Subject: [PATCH 1/4] pacemaker: Don't add explicit error prefix in log
|
||||
|
||||
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
||||
---
|
||||
src/pacemaker.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pacemaker.c b/src/pacemaker.c
|
||||
index 5c4c1de..cef8c41 100644
|
||||
--- a/src/pacemaker.c
|
||||
+++ b/src/pacemaker.c
|
||||
@@ -145,7 +145,7 @@ static int pcmk_write_ticket_atomic(struct ticket_config *tk, int grant)
|
||||
rv = system(cmd);
|
||||
log_debug("command: '%s' was executed", cmd);
|
||||
if (rv != 0)
|
||||
- log_error("error: \"%s\" failed, %s", cmd, interpret_rv(rv));
|
||||
+ log_error("\"%s\" failed, %s", cmd, interpret_rv(rv));
|
||||
|
||||
return rv;
|
||||
}
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user