SONAR-2299 Show Hibernate SQL only if debug logging level enabled, but not info level

diff --git a/sonar-application/src/main/assembly/conf/logback.xml b/sonar-application/src/main/assembly/conf/logback.xml
index 47de61218c1e1f7a845b8bef445256038fd27412..407cbdbe265b5fe00c802ea4c00647350365d6ee 100644 (file)
--- a/sonar-application/src/main/assembly/conf/logback.xml
+++ b/sonar-application/src/main/assembly/conf/logback.xml
@@ -89,7 +89,7 @@
     <level value="ERROR"/>
   </logger>
 
-  <!-- set INFO to activate Hibernate SQL logs. NOT RECOMMENDED  -->
+  <!-- set DEBUG to activate Hibernate SQL logs. NOT RECOMMENDED  -->
   <logger name="org.hibernate.SQL">
     <level value="ERROR"/>
   </logger>

diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
index cd79fb299d6171f97b2e41c33319cfad510ef1db..91b34037ace613245c84989ec3da4b9bbb0e1422 100644 (file)
--- a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
@@ -12,7 +12,7 @@
     <level value="WARN"/>
   </logger>
 
-  <!-- set INFO to activate SQL logs. NOT RECOMMENDED  -->
+  <!-- set DEBUG to activate SQL logs. NOT RECOMMENDED  -->
   <logger name="org.hibernate.SQL">
     <level value="ERROR"/>
   </logger>

diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java b/sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java
index ba3e77928fa86a53d8bd7c50cfeb99a7a291f114..e543fecc28f76eeed00bc7348e041e2cead8d03f 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java
@@ -71,6 +71,7 @@ public abstract class AbstractDatabaseConnector implements DatabaseConnector {
   public String getDialectId() {
     return dialect.getId();
   }
+
   /**
    * Indicates if the connector is operational : database connection OK and schema version OK
    */
@@ -158,12 +159,12 @@ public abstract class AbstractDatabaseConnector implements DatabaseConnector {
     props.put(Environment.DIALECT, getDialectClass());
 
     props.put("hibernate.generate_statistics", getConfiguration().getBoolean(DatabaseProperties.PROP_HIBERNATE_GENERATE_STATISTICS, false));
-    props.put("hibernate.show_sql", Boolean.valueOf(LOG_SQL.isInfoEnabled()).toString());
+    props.put("hibernate.show_sql", Boolean.valueOf(LOG_SQL.isDebugEnabled()).toString());
 
     Configuration subset = getConfiguration().subset("sonar.hibernate");
     for (Iterator keys = subset.getKeys(); keys.hasNext();) {
       String key = (String) keys.next();
-      if (StringUtils.isNotBlank((String)subset.getProperty(key))) {
+      if (StringUtils.isNotBlank((String) subset.getProperty(key))) {
         props.put("hibernate." + key, subset.getProperty(key));
       }
     }
@@ -171,7 +172,6 @@ public abstract class AbstractDatabaseConnector implements DatabaseConnector {
     // custom impl setup
     setupEntityManagerFactory(props);
 
-
     return props;
   }