Changelog:

* logging request details nicely, including payload * error handling fix, exceptions converted to java RuntimeException, related to JENKINS-24232 * on error displaying stack trace as well
jenkinsci · Oct 24, 2014 · 81e2725 · 81e2725
1 parent f5085ae
commit 81e2725
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/models/api.rb b/models/api.rb
@@ -11,6 +11,7 @@
 
 java_import Java.java.util.logging.Logger
 java_import Java.java.util.logging.Level
+java_import Java.org.jruby.exceptions.RaiseException
 
 module GitlabWebHook
   class Api < Sinatra::Base
@@ -50,16 +51,21 @@ def process_projects(action)
     rescue => e
       # avoid method signature warnings
       severe = LOGGER.java_method(:log, [Level, java.lang.String, java.lang.Throwable])
-      severe.call(Level::SEVERE, e.message, e)
+      severe.call(Level::SEVERE, e.message, RaiseException.new(e))
       status 500
-      e.message
+      [e.message, '', 'Stack trace:', e.backtrace].flatten.join('<br>')
     end
 
     def parse_request
-      details = ParseRequest.new.from(params, request)
-      LOGGER.info("gitlab web hook triggered for repo url #{details.repository_url} and #{details.branch} branch")
-      LOGGER.info("with payload: #{details.payload}")
-      details
+      ParseRequest.new.from(params, request).tap do |details|
+        LOGGER.info([
+            'gitlab web hook triggered for',
+            "   - repo url: #{details.repository_url}",
+            "   - branch: #{details.branch}",
+            '   - with payload:',
+            details.payload.pretty_inspect
+        ].join("\n"))
+      end
     end
   end
 end