- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out
parameter defaults Resolves: RHEL-85057
This commit is contained in:
parent
5d821e923d
commit
d8910789b8
23
RHEL-85057-2-tomcat-log-validate-all-on-debug-level.patch
Normal file
23
RHEL-85057-2-tomcat-log-validate-all-on-debug-level.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From fbefa52578c5b803e986466e0b9930316a779adb Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Wed, 9 Apr 2025 12:30:36 +0200
|
||||
Subject: [PATCH] tomcat: only log "validate_all_tomcat[$TOMCAT_NAME]" on
|
||||
debug-level
|
||||
|
||||
---
|
||||
heartbeat/tomcat | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/heartbeat/tomcat b/heartbeat/tomcat
|
||||
index 1e8f21638..540cb733e 100755
|
||||
--- a/heartbeat/tomcat
|
||||
+++ b/heartbeat/tomcat
|
||||
@@ -560,7 +560,7 @@ validate_all_tomcat()
|
||||
{
|
||||
local port
|
||||
local rc=$OCF_SUCCESS
|
||||
- ocf_log info "validate_all_tomcat[$TOMCAT_NAME]"
|
||||
+ ocf_log debug "validate_all_tomcat[$TOMCAT_NAME]"
|
||||
|
||||
check_binary $WGET
|
||||
|
@ -45,7 +45,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.16.0
|
||||
Release: 11%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 12%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
@ -67,7 +67,8 @@ Patch14: RHEL-73689-1-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.
|
||||
Patch15: RHEL-73689-2-ocf-shellfuncs-add-missing-variable-in-crm_mon_no_validation.patch
|
||||
Patch16: RHEL-79822-1-portblock-fix-version-detection.patch
|
||||
Patch17: RHEL-79822-2-portblock-use-ocf_log-for-logging.patch
|
||||
Patch18: RHEL-85057-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
|
||||
Patch18: RHEL-85057-1-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
|
||||
Patch19: RHEL-85057-2-tomcat-log-validate-all-on-debug-level.patch
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aliyun.patch
|
||||
@ -245,6 +246,7 @@ exit 1
|
||||
%patch -p1 -P 16
|
||||
%patch -p1 -P 17
|
||||
%patch -p1 -P 18
|
||||
%patch -p1 -P 19
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch -p1 -P 500
|
||||
@ -575,12 +577,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Tue Apr 1 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-11
|
||||
* Wed Apr 9 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-12
|
||||
- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out
|
||||
parameter defaults
|
||||
|
||||
Resolves: RHEL-85057
|
||||
|
||||
* Tue Apr 1 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-11
|
||||
- powervs-subnet: build for ppc64le
|
||||
|
||||
Resolves: RHEL-85057, RHEL-85023
|
||||
Resolves: RHEL-85023
|
||||
|
||||
* Thu Feb 20 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-9
|
||||
- portblock: fix iptables version detection
|
||||
|
Loading…
Reference in New Issue
Block a user