Browse Source

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

tags/2.8
Evgeny Mandrikov 13 years ago
parent
commit
09566e047c

+ 1
- 1
sonar-application/src/main/assembly/conf/logback.xml View File

@@ -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>

+ 1
- 1
sonar-batch/src/main/resources/org/sonar/batch/logback.xml View File

@@ -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>

+ 3
- 3
sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java View File

@@ -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;
}


Loading…
Cancel
Save