diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java | 19 |
1 files changed, 7 insertions, 12 deletions
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("****************************************************************"); |