aboutsummaryrefslogtreecommitdiff
path: root/moaSig/moa-sig/src/main/resources/log4j.properties
diff options
context:
space:
mode:
authorThomas <>2021-03-24 12:16:25 +0100
committerThomas <>2021-03-24 12:16:25 +0100
commit835a395f3ecb7477b5b67e9da9bf3af58c86473a (patch)
tree916fa7705879063f6b83517d80197c37dc53caf8 /moaSig/moa-sig/src/main/resources/log4j.properties
parenta972fba0402eca3c5fcfcd1eef1979808fd716a1 (diff)
parent666d8c9f8cec7573e60a14ab039c0874f6a9ec53 (diff)
downloadmoa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.tar.gz
moa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.tar.bz2
moa-sig-835a395f3ecb7477b5b67e9da9bf3af58c86473a.zip
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig
# Conflicts: # moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java # moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
Diffstat (limited to 'moaSig/moa-sig/src/main/resources/log4j.properties')
-rw-r--r--moaSig/moa-sig/src/main/resources/log4j.properties17
1 files changed, 12 insertions, 5 deletions
diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties
index 7beb0c5..61f0cfe 100644
--- a/moaSig/moa-sig/src/main/resources/log4j.properties
+++ b/moaSig/moa-sig/src/main/resources/log4j.properties
@@ -6,15 +6,22 @@
org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
# Configure root logger and loggers for moa-spss
-log4j.rootLogger=TRACE, stdout
-log4j.logger.moa.spss.server=TRACE, stdout, moaspss
-log4j.logger.iaik.server=TRACE, stdout, moaspss
+log4j.rootLogger=warn,stdout
+log4j.logger.moa.spss.server=info,moaspss
+log4j.logger.iaik.server=info,moaspss
+log4j.logger.iaik.pki=info,moaspss
+log4j.logger.at.gv.egovernment.moa.spss=info, moaspss
+
+log4j.rootLogger=warn, stdout
+log4j.logger.moa.spss.server=info, stdout, moaspss
+log4j.logger.iaik.server=info, stdout, moaspss
log4j.logger.at.gv.egovernment.moa.spss=TRACE, stdout, moaspss
+>>>>>>> moaSig/moa-sig/src/main/resources/log4j.properties
# Configure the 'stdout' appender to write logging output to the console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
+log4j.appender.stdout.layout.ConversionPattern=log4j | %5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
# Configure the 'moaspss' appender to write moa-spss related logging output
# to the file '${catalina.base}/logs/moa-spss.log'. The file is rolled over every 1000KB,
@@ -24,7 +31,7 @@ log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log
log4j.appender.moaspss.MaxFileSize=1000KB
log4j.appender.moaspss.MaxBackupIndex=10
log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
-log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
+log4j.appender.moaspss.layout.ConversionPattern=log4j | %5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
# Configure the jdbc appender 'JDBC' to write logging output
# to the given PostgreSQL database