diff options
Diffstat (limited to 'sonar-scanner-engine')
3 files changed, 27 insertions, 58 deletions
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml index bf933c3fc8a..52120f96acf 100644 --- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml +++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml @@ -19,47 +19,28 @@ </appender> <!-- BeanUtils generate too many DEBUG logs when sonar.verbose is set --> - <logger name="org.apache.commons.beanutils.converters"> - <level value="WARN"/> - </logger> + <logger name="org.apache.commons.beanutils.converters" level="WARN"/> <!-- FileSnapshot generate too many DEBUG logs when sonar.verbose is set --> - <logger name="org.eclipse.jgit.internal.storage.file"> - <level value="INFO"/> - </logger> + <logger name="org.eclipse.jgit.internal.storage.file" level="INFO"/> <!-- Spring generates too many DEBUG logs when sonar.verbose is set --> - <logger name="org.springframework"> - <level value="INFO"/> - </logger> + <logger name="org.springframework" level="INFO"/> <!-- AbstractApplicationContext generate too verbose warning if warn is Enabled --> - <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext"> - <level value="ERROR"/> - </logger> + <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext" level="ERROR"/> - <logger name="org.sonar.core.platform.PriorityBeanFactory"> - <level value="INFO"/> - </logger> + <logger name="org.sonar.core.platform.PriorityBeanFactory" level="INFO"/> <!-- sonar.showSql --> <!-- see also org.sonar.db.MyBatis#configureLogback() --> - <logger name="org.mybatis"> - <level value="${SQL_LOGGER_LEVEL:-WARN}"/> - </logger> - <logger name="org.apache.ibatis"> - <level value="${SQL_LOGGER_LEVEL:-WARN}"/> - </logger> - <logger name="java.sql"> - <level value="${SQL_LOGGER_LEVEL:-WARN}"/> - </logger> - <logger name="java.sql.ResultSet"> - <level value="WARN"/> - </logger> + <logger name="org.mybatis" level="${SQL_LOGGER_LEVEL:-WARN}"/> + <logger name="org.apache.ibatis" level="${SQL_LOGGER_LEVEL:-WARN}"/> + <logger name="java.sql" level="${SQL_LOGGER_LEVEL:-WARN}"/> + <logger name="java.sql.ResultSet" level="WARN"/> - <root> + <root level="${ROOT_LOGGER_LEVEL}"> <!-- sonar.verbose --> - <level value="${ROOT_LOGGER_LEVEL}"/> <appender-ref ref="STDOUT"/> </root> diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml index 4763605d094..462caaf66cf 100644 --- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml +++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml @@ -15,13 +15,10 @@ </appender> <!-- BeanUtils generate to many DEBUG logs when sonar.verbose is set --> - <logger name="org.apache.commons.beanutils.converters"> - <level value="WARN"/> - </logger> + <logger name="org.apache.commons.beanutils.converters" level="WARN"/> - <root> + <root level="${ROOT_LOGGER_LEVEL}"> <!-- sonar.verbose --> - <level value="${ROOT_LOGGER_LEVEL}"/> <appender-ref ref="STDOUT"/> </root> diff --git a/sonar-scanner-engine/src/test/resources/logback-test.xml b/sonar-scanner-engine/src/test/resources/logback-test.xml index 0693729e99c..d118e00aa3f 100644 --- a/sonar-scanner-engine/src/test/resources/logback-test.xml +++ b/sonar-scanner-engine/src/test/resources/logback-test.xml @@ -12,33 +12,24 @@ </appender> <!-- BeanUtils generate to many DEBUG logs when sonar.verbose is set --> - <logger name="org.apache.commons.beanutils.converters"> - <level value="WARN"/> - </logger> + <logger name="org.apache.commons.beanutils.converters" level="WARN"/> <!-- sonar.showSql --> <!-- see also org.sonar.db.MyBatis#configureLogback() --> - <logger name="org.mybatis"> - <level value="WARN"/> - </logger> - <logger name="org.apache.ibatis"> - <level value="WARN"/> - </logger> - <logger name="java.sql"> - <level value="WARN"/> - </logger> - <logger name="java.sql.ResultSet"> - <level value="WARN"/> - </logger> - <logger name="PERSISTIT"> - <level value="WARN"/> - </logger> - <logger name="ch.qos.logback"> - <level value="WARN"/> - </logger> - - <root> - <level value="INFO"/> + <logger name="org.mybatis" level="WARN"/> + + <logger name="org.apache.ibatis" level="WARN"/> + + <logger name="java.sql" level="WARN"/> + + <logger name="java.sql.ResultSet" level="WARN"/> + + <logger name="PERSISTIT" level="WARN"/> + + <logger name="ch.qos.logback" level="WARN"/> + + + <root level="INFO"> <appender-ref ref="STDOUT"/> </root> |