From 1d055898695f3eb1eafe9d38322744f760154d59 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 6 Jun 2025 10:41:12 +0200
Subject: [PATCH 1/3] syslog

---
 client/conf/log4j-cloud.xml.in | 4 +---
 server/conf/log4j-cloud.xml.in | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/conf/log4j-cloud.xml.in b/client/conf/log4j-cloud.xml.in
index 26da171269de..bbcf37598dbc 100755
--- a/client/conf/log4j-cloud.xml.in
+++ b/client/conf/log4j-cloud.xml.in
@@ -50,9 +50,7 @@ under the License.
       <!-- Append warnings+ to the syslog if it is listening on UDP port -->
       <!-- ============================== -->
 
-      <Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
-         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-         <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
+      <Syslog name="SYSLOG" host="localhost" port="514" protocol="UDP" appName="ApacheCloudStack" facility="LOCAL6">
       </Syslog>
 
       <!-- ============================== -->
diff --git a/server/conf/log4j-cloud.xml.in b/server/conf/log4j-cloud.xml.in
index 9a8e5dc7bf33..f68e08cd242f 100755
--- a/server/conf/log4j-cloud.xml.in
+++ b/server/conf/log4j-cloud.xml.in
@@ -56,10 +56,7 @@ under the License.
       <!-- Append warnings+ to the syslog if it is listening on UDP port -->
       <!-- ============================== -->
 
-
-      <Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
-         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-         <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/>
+      <Syslog name="SYSLOG" host="localhost" port="514" protocol="UDP" appName="ApacheCloudStack" facility="LOCAL6">
       </Syslog>
 
       <!-- ============================== -->

From 7943aa4de4bfcd78040d542b663dfe1905022eaf Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@gmail.com>
Date: Thu, 12 Jun 2025 09:04:18 +0200
Subject: [PATCH 2/3] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: João Jandre <48719461+JoaoJandre@users.noreply.github.com>
---
 client/conf/log4j-cloud.xml.in | 2 ++
 server/conf/log4j-cloud.xml.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/client/conf/log4j-cloud.xml.in b/client/conf/log4j-cloud.xml.in
index bbcf37598dbc..6a85fc98599d 100755
--- a/client/conf/log4j-cloud.xml.in
+++ b/client/conf/log4j-cloud.xml.in
@@ -51,6 +51,8 @@ under the License.
       <!-- ============================== -->
 
       <Syslog name="SYSLOG" host="localhost" port="514" protocol="UDP" appName="ApacheCloudStack" facility="LOCAL6">
+               <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
+               <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
       </Syslog>
 
       <!-- ============================== -->
diff --git a/server/conf/log4j-cloud.xml.in b/server/conf/log4j-cloud.xml.in
index f68e08cd242f..b16ac842401f 100755
--- a/server/conf/log4j-cloud.xml.in
+++ b/server/conf/log4j-cloud.xml.in
@@ -57,6 +57,8 @@ under the License.
       <!-- ============================== -->
 
       <Syslog name="SYSLOG" host="localhost" port="514" protocol="UDP" appName="ApacheCloudStack" facility="LOCAL6">
+            <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
       </Syslog>
 
       <!-- ============================== -->

From fd85caa7f6d1d155bf6909d9a52f04b2e456ebac Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@gmail.com>
Date: Fri, 13 Jun 2025 19:58:51 +0200
Subject: [PATCH 3/3] Update server/conf/log4j-cloud.xml.in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: João Jandre <48719461+JoaoJandre@users.noreply.github.com>
---
 server/conf/log4j-cloud.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/conf/log4j-cloud.xml.in b/server/conf/log4j-cloud.xml.in
index b16ac842401f..5841ca7a82da 100755
--- a/server/conf/log4j-cloud.xml.in
+++ b/server/conf/log4j-cloud.xml.in
@@ -58,7 +58,7 @@ under the License.
 
       <Syslog name="SYSLOG" host="localhost" port="514" protocol="UDP" appName="ApacheCloudStack" facility="LOCAL6">
             <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
+            <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) %m%ex%n"/>
       </Syslog>
 
       <!-- ============================== -->