Merge branch 'master' of github.com:pjhyett/github-services

pjhyett · pjhyett · commit 646760dcffa2 · 2010-01-26T23:02:51.000-08:00
diff --git a/github-services.rb b/github-services.rb
@@ -54,12 +54,13 @@ def service(name)
           yield data, payload
         end
       rescue => boom
-        hook_data = params[:data].dup
+        # redact sensitive info in hook_data hash
+        hook_data = data || params[:data]
         %w[password token].each { |key| hook_data[key] &&= '<redacted>' }
         report_exception boom,
           :hook_name    => name,
-          :hook_data    => hook_data,
-          :hook_payload => params[:payload]
+          :hook_data    => hook_data.inspect,
+          :hook_payload => (payload || params[:payload]).inspect
         raise
       end
     end
