summaryrefslogtreecommitdiffstats
path: root/src/main/properties
diff options
context:
space:
mode:
authorManuel Bentele2021-12-15 14:47:13 +0100
committerManuel Bentele2021-12-15 14:47:13 +0100
commit0d7adb07774074867d1784c27a93d030dacf286d (patch)
tree0d594f033b8c5d43182bea1367c67d568ca83e40 /src/main/properties
parentpom: Add "modern" way to set target Java version (diff)
downloadmasterserver-0d7adb07774074867d1784c27a93d030dacf286d.tar.gz
masterserver-0d7adb07774074867d1784c27a93d030dacf286d.tar.xz
masterserver-0d7adb07774074867d1784c27a93d030dacf286d.zip
Update log4j because of the CVE-2021-44228 security flaw
Diffstat (limited to 'src/main/properties')
-rw-r--r--src/main/properties/log4j.properties14
-rw-r--r--src/main/properties/log4j2.properties44
2 files changed, 44 insertions, 14 deletions
diff --git a/src/main/properties/log4j.properties b/src/main/properties/log4j.properties
deleted file mode 100644
index 3baa9b6..0000000
--- a/src/main/properties/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# root level logging configuration
-log4j.rootLogger=ALL, console
-
-# configuration for console output
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%t] %-5p %F - %m%n
-log4j.appender.console.encoding=UTF-8
-log4j.appender.console.Threshold=INFO
-
-# overwrite logging level for specific packages and classes
-log4j.logger.org.apache.directory=ERROR
-log4j.logger.org.apache.mina=ERROR
-log4j.logger.org.apache.thrift.server.AbstractNonblockingServer=ERROR
diff --git a/src/main/properties/log4j2.properties b/src/main/properties/log4j2.properties
new file mode 100644
index 0000000..c4175b0
--- /dev/null
+++ b/src/main/properties/log4j2.properties
@@ -0,0 +1,44 @@
+status=error
+name=log4j2PropertiesConfig
+
+#
+# root level logging configuration
+#
+rootLogger.level=all
+rootLogger.appenderRefs=stdout
+rootLogger.appenderRef.stdout.ref=logToConsole
+
+#
+# configuration for console output
+#
+appenders=console
+
+appender.console.type=Console
+appender.console.name=logToConsole
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %-5p %F - %m%n
+appender.console.filter.threshold.type=ThresholdFilter
+appender.console.filter.threshold.level=info
+
+#
+# overwrite logging level for specific packages and classes
+#
+loggers=apacheDirectory,apacheMina,apacheThriftServer
+
+# overwrite logging level for org.apache.directory package
+logger.apacheDirectory.name=org.apache.directory
+logger.apacheDirectory.level=error
+logger.apacheDirectory.appenderRefs=stdout
+logger.apacheDirectory.appenderRef.stdout.ref=logToConsole
+
+# overwrite logging level for org.apache.mina package
+logger.apacheMina.name=org.apache.mina
+logger.apacheMina.level=error
+logger.apacheMina.appenderRefs=stdout
+logger.apacheMina.appenderRef.stdout.ref=logToConsole
+
+# overwrite logging level for org.apache.thrift.server.AbstractNonblockingServer class
+logger.apacheThriftServer.name=org.apache.thrift.server.AbstractNonblockingServer
+logger.apacheThriftServer.level=error
+logger.apacheThriftServer.appenderRefs=stdout
+logger.apacheThriftServer.appenderRef.stdout.ref=logToConsole