From: Fabrice Bellingard <bellingard@gmail.com>
Date: Fri, 6 Jul 2012 15:27:59 +0000 (+0200)
Subject: SONAR-3590 Log all Rails warnings & errors in "sonar.log" file
X-Git-Tag: 3.2~184
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d383475212ca9d551adcf458657ae4556721e34f;p=sonarqube.git

SONAR-3590 Log all Rails warnings & errors in "sonar.log" file

=> Initial issue: when an exception is raised in a ruby widget, the
   error stack trace is not logged in the sonar.log file
---

diff --git a/sonar-application/src/main/assembly/conf/logback.xml b/sonar-application/src/main/assembly/conf/logback.xml
index a380678fc9d..1c36ddc015a 100644
--- a/sonar-application/src/main/assembly/conf/logback.xml
+++ b/sonar-application/src/main/assembly/conf/logback.xml
@@ -37,16 +37,22 @@
     </encoder>
   </appender>
 
-  <!--
-   Profiling of HTTP requests. Set level to DEBUG in order to log all the HTTP and SQL requests.
-   Example of command-line to get the HTTP requests with execution time greater than 10s :
-   grep 'rails  Completed in [0-9]\{5,\}ms' < profiling.log
-  -->
+  <!-- Display Rails warnings and errors in the standard Sonar log -->
   <logger name="rails" additivity="false">
     <level value="WARN"/>
+    <appender-ref ref="SONAR_FILE"/>
+  </logger>
+  <!--
+   Profiling of HTTP and SQL requests in Rails:
+   
+  <logger name="rails" additivity="false">
+    <level value="DEBUG"/>
     <appender-ref ref="PROFILING_FILE"/>
   </logger>
-
+  
+   Example of command-line to get the HTTP requests with execution time greater than 10s :
+   grep 'rails  Completed in [0-9]\{5,\}ms' < profiling.log
+  -->
 
   <logger name="org.hibernate.cache.ReadWriteCache">
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index 1dc049c3569..efc56ebae26 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -122,7 +122,7 @@ module DashboardHelper
         widget_body=render :inline => widget.java_definition.getTarget().getTemplate(), :locals => {:widget_properties => widget.properties_as_hash, :widget => widget, :dashboard_configuration => @dashboard_configuration}
       rescue => error
         logger.error(message('dashboard.cannot_render_widget_x', :params => [widget.java_definition.getId(), error]))
-        logger.error(error.backtrace.join('\n'))
+        error.backtrace.each { |line| logger.error('  ' + line) }
       end
     end
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
index d73c740127e..ffbf6fdc01f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/widget/index.html.erb
@@ -5,7 +5,7 @@
          widget_body=render :inline => @widget_definition.getTarget().getTemplate(), :locals => {:widget_properties => @widget.properties_as_hash, :widget => @widget, :dashboard_configuration => @dashboard_configuration}
        rescue => error
          logger.error(message('dashboard.cannot_render_widget_x', :params => [@widget_definition.getId(), error]))
-         logger.error(error.backtrace.join("\n"))
+         error.backtrace.each { |line| logger.error('  ' + line) }
          widget_body=""
        end