commit 445665af72937e29454995312912d5aaa3d7fd60
author Paul Fertser <fercerpav@gmail.com> Thu Mar 17 14:45:42 2022 +0000
committer Matt Spinler <spinler@us.ibm.com> Fri Apr 08 14:28:02 2022 +0000
tree 770a931b8b1067ba4b56bf7d2db59572304e5168
parent 6ef6b25e44e07e1af74f2578d30331922c7879ac

rsyslog-config: fix disabled config

When no remote syslog is used action ~ (drop) isn't appropriate as it
inhibits processing of the current message for any additional configs
that might come after server.conf. This file shouldn't be empty either
as there're no other output actions defined in default configuration.

Make it a no-op by sending to /dev/null instead. Add a linefeed at the
end so that "cat server.conf" would look nicer.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Change-Id: I6636c76cf0304b3c36f579225846ab19e992c333

test/remote_logging_test_config.cpp

diff --git a/test/remote_logging_test_config.cpp b/test/remote_logging_test_config.cpp
index 53298c6..f21904b 100644
--- a/test/remote_logging_test_config.cpp
+++ b/test/remote_logging_test_config.cpp
@@ -28,13 +28,13 @@
 TEST_F(TestRemoteLogging, testOnlyAddress)
 {
     config->address("1.1.1.1");
-    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* ~");
+    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* /dev/null");
 }
 
 TEST_F(TestRemoteLogging, testOnlyPort)
 {
     config->port(100);
-    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* ~");
+    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* /dev/null");
 }
 
 TEST_F(TestRemoteLogging, testGoodConfig)
@@ -50,7 +50,7 @@
     config->port(100);
     EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* @@1.1.1.1:100");
     config->address("");
-    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* ~");
+    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* /dev/null");
 }
 
 TEST_F(TestRemoteLogging, testClearPort)
@@ -59,7 +59,7 @@
     config->port(100);
     EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* @@1.1.1.1:100");
     config->port(0);
-    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* ~");
+    EXPECT_EQ(getConfig(configFilePath.c_str()), "*.* /dev/null");
 }
 
 TEST_F(TestRemoteLogging, testGoodIPv6Config)