From 1f2e532e7b15abe99f30e3c08ee280f77bf7ca24 Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <bellingard@gmail.com>
Date: Mon, 16 Jul 2012 14:05:59 +0200
Subject: [PATCH] Improve logging for DEV mode (based on modifications for
 SONAR-3590)

---
 sonar-server/src/dev/h2/conf/logback.xml         | 15 +++++++--------
 sonar-server/src/dev/mysql/conf/logback.xml      | 16 +++++++---------
 sonar-server/src/dev/postgresql/conf/logback.xml |  4 ++--
 .../WEB-INF/config/environments/development.rb   |  5 ++++-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sonar-server/src/dev/h2/conf/logback.xml b/sonar-server/src/dev/h2/conf/logback.xml
index e17be7b8999..6548deb530e 100644
--- a/sonar-server/src/dev/h2/conf/logback.xml
+++ b/sonar-server/src/dev/h2/conf/logback.xml
@@ -10,30 +10,29 @@
   </appender>
 
   <logger name="org.hibernate.SQL">
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.hibernate.cache.ReadWriteCache">
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.hibernate.cache.EhCacheProvider">
     <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.sonar.INFO">
-  	<level value="INFO"/>
+    <level value="INFO"/>
   </logger>
 
   <logger name="net.sf.ehcache">
-  	<level value="INFO"/>
+    <level value="INFO"/>
   </logger>
 
-
-  <logger name="rails.sonar">
-  	<level value="INFO"/>
+  <logger name="rails">
+    <level value="DEBUG"/>
   </logger>
 
   <root>
diff --git a/sonar-server/src/dev/mysql/conf/logback.xml b/sonar-server/src/dev/mysql/conf/logback.xml
index 5cd45f7ce52..6548deb530e 100644
--- a/sonar-server/src/dev/mysql/conf/logback.xml
+++ b/sonar-server/src/dev/mysql/conf/logback.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <configuration>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -11,30 +10,29 @@
   </appender>
 
   <logger name="org.hibernate.SQL">
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.hibernate.cache.ReadWriteCache">
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.hibernate.cache.EhCacheProvider">
     <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-  	<level value="ERROR"/>
+    <level value="ERROR"/>
   </logger>
 
   <logger name="org.sonar.INFO">
-  	<level value="INFO"/>
+    <level value="INFO"/>
   </logger>
 
   <logger name="net.sf.ehcache">
-  	<level value="INFO"/>
+    <level value="INFO"/>
   </logger>
 
-
-  <logger name="rails.sonar">
-  	<level value="INFO"/>
+  <logger name="rails">
+    <level value="DEBUG"/>
   </logger>
 
   <root>
diff --git a/sonar-server/src/dev/postgresql/conf/logback.xml b/sonar-server/src/dev/postgresql/conf/logback.xml
index b7f6068559c..6548deb530e 100644
--- a/sonar-server/src/dev/postgresql/conf/logback.xml
+++ b/sonar-server/src/dev/postgresql/conf/logback.xml
@@ -31,8 +31,8 @@
     <level value="INFO"/>
   </logger>
 
-  <logger name="rails.sonar">
-    <level value="INFO"/>
+  <logger name="rails">
+    <level value="DEBUG"/>
   </logger>
 
   <root>
diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb b/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb
index 48c895e5cca..08f7bfd140c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/config/environments/development.rb
@@ -11,4 +11,7 @@ config.whiny_nils = true
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
\ No newline at end of file
+config.action_controller.perform_caching             = false
+
+config.logger = Slf4jLogger.new
+ActiveRecord::Base.logger = config.logger
\ No newline at end of file
-- 
2.39.5