aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2021-03-24 11:07:43 +0000
committerThomas Lenz <thomas.lenz@egiz.gv.at>2021-03-24 11:07:43 +0000
commitcd65b47cc30e7119593bbb05afa48d4f896a4859 (patch)
treed9b2506506cf544ea3758322fd5488c913073427
parent84d05bbce50208d3a6be94a0725ee6dab930a08f (diff)
parentd003a873fdeec22b1dd57d61590a12a1691ae137 (diff)
downloadmoa-sig-cd65b47cc30e7119593bbb05afa48d4f896a4859.tar.gz
moa-sig-cd65b47cc30e7119593bbb05afa48d4f896a4859.tar.bz2
moa-sig-cd65b47cc30e7119593bbb05afa48d4f896a4859.zip
Merge branch 'master' into 'feature/codestyle_and_gitlab_ci'
# Conflicts: # moaSig/build.gradle # moaSig/common/build.gradle # moaSig/moa-sig/build.gradle # moaSig/moa-sig/src/main/resources/log4j.properties
-rw-r--r--moaSig/moa-sig/src/main/resources/log4j.properties14
1 files changed, 10 insertions, 4 deletions
diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties
index d7522a7..61f0cfe 100644
--- a/moaSig/moa-sig/src/main/resources/log4j.properties
+++ b/moaSig/moa-sig/src/main/resources/log4j.properties
@@ -7,10 +7,16 @@ org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFacto
# Configure root logger and loggers for moa-spss
log4j.rootLogger=warn,stdout
-#log4j.logger.moa.spss.server=debug,moaspss
-#log4j.logger.iaik.server=debug,moaspss
-#log4j.logger.iaik.pki=debug,moaspss
-#log4j.logger.at.gv.egovernment.moa.spss=debug, moaspss
+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