From 29ab4afb7a063b6fd49b996f38053b12b8cc9540 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Tue, 27 Apr 2021 14:24:45 +0200
Subject: [server] Set log4j debug level for console (INFO)

---
 dozentenmodulserver/pom.xml                           |  8 ++++++++
 .../src/main/java/org/openslx/bwlp/sat/App.java       | 19 +++++++------------
 .../src/main/properties/log4j.properties              |  9 +++++++++
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 dozentenmodulserver/src/main/properties/log4j.properties

diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index 43339e0d..b09b3976 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -149,6 +149,14 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/properties</directory>
+				<includes>
+					<include>*.properties</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 
 	<dependencies>
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index da9cfe68..2023d6b8 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -10,9 +10,8 @@ import java.util.Set;
 import javax.net.ssl.SSLContext;
 
 import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.Updater;
@@ -41,20 +40,16 @@ public class App {
 
 	private static Logger LOGGER = Logger.getLogger(App.class);
 
-	public static boolean DEBUG = false;
-
 	private static final Set<String> failFastMethods = new HashSet<>();
 
 	public static void main(String[] args) throws TTransportException, NoSuchAlgorithmException, IOException,
-			KeyManagementException {
-		// get going and show basic information in log file
-		// don't add date/time to log output - will be done by syslog
-		ConsoleAppender appender = new ConsoleAppender(new PatternLayout("%-5p [%t] %C{1} - %m%n"));
-		appender.setEncoding("UTF-8");
-		BasicConfigurator.configure(appender);
-		if (args.length != 0 && args[0].equals("debug")) {
-			DEBUG = true;
+			KeyManagementException
+	{
+		// setup basic logging appender to log output on console if no external appender (log4j.properties) is configured
+		if (LogManager.getRootLogger().getAllAppenders() == null) {
+			BasicConfigurator.configure();
 		}
+		
 		LOGGER.info("****************************************************************");
 		LOGGER.info("******************* Starting Application ***********************");
 		LOGGER.info("****************************************************************");
diff --git a/dozentenmodulserver/src/main/properties/log4j.properties b/dozentenmodulserver/src/main/properties/log4j.properties
new file mode 100644
index 00000000..0973166a
--- /dev/null
+++ b/dozentenmodulserver/src/main/properties/log4j.properties
@@ -0,0 +1,9 @@
+# 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
-- 
cgit v1.2.3-55-g7522