redmine_airbrake_backend 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8491f61028050f6bddc8ab2a4f1b058ac0345a6
-  data.tar.gz: 3be0314d2231897aeb5822f2ce244852ae19d98e
+  metadata.gz: fede908ea4433fdce923fbdd62b4bd27cd17e3bb
+  data.tar.gz: 2e86039dabbd831acd7e98ef00c1fe4a2257c784
 SHA512:
-  metadata.gz: 6b69fa46ffcc8ed4eb860d4cff31542d707797c0dbd253709799ab5ea15dcfa2784656099feb17997058e4459bbcc549ca67ea4999f560c7e514cd70e52187b9
-  data.tar.gz: e2f410b9e81b87c6f8885684439e863647952dfa0ee158513c412c61d7bbb57ef3e9ee99b69699a4961bedf374648e09a2222917aa0e037c48544c1ad16035e7
+  metadata.gz: 0bf50e59f151679b90705f180d054b3ae9eb1d889f4126c42ee1363422da36f6359e5485a4c06a610c1d805bb3bac9c3f57968245fa4072229da7dec6a837760
+  data.tar.gz: afbdb05de2139170591a40c8a9b4cfa461be1f80c8482456768ba6cbf99d61988d07c61cffea130a2701fd50a3d2dcbb8f4484ab851484fc5c3c845d3b2cb997

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redmine_airbrake_backend (0.2.4)
+    redmine_airbrake_backend (0.3.1)
       hpricot
       htmlentities
       rails

data/app/controllers/airbrake_controller.rb

@@ -99,18 +99,20 @@ class AirbrakeController < ::ApplicationController
   end
 
   def subject
-    if @notice.error[:message].starts_with?("#{@notice.error[:class]}:")
-      "[#{notice_hash[0..7]}] #{@notice.error[:message]}"[0..254]
+    s = ''
+    if @notice.error[:class].blank? || @notice.error[:message].starts_with?("#{@notice.error[:class]}:")
+      s = "[#{notice_hash[0..7]}] #{@notice.error[:message]}"
     else
-      "[#{notice_hash[0..7]}] #{@notice.error[:class]} #{@notice.error[:message]}"[0..254]
+      s = "[#{notice_hash[0..7]}] #{@notice.error[:class]} #{@notice.error[:message]}"
     end
+    s[0..254].strip
   end
 
   def notice_hash
     h = []
     h << @notice.error[:class]
     h << @notice.error[:message]
-    h += normalized_backtrace if @notice.error[:backtrace].present?
+    h += normalized_backtrace
 
     Digest::MD5.hexdigest(h.compact.join("\n"))
   end

data/app/controllers/airbrake_project_settings_controller.rb

@@ -1,10 +1,10 @@
 class AirbrakeProjectSettingsController < ::ApplicationController
   before_filter :find_project
+  before_filter :find_airbrake_setting
 
   menu_item :settings
 
   def update
-    @airbrake_project_setting = @project.airbrake_settings || AirbrakeProjectSetting.new(project: @project)
     @airbrake_project_setting.safe_attributes = params[:airbrake_project_setting]
 
     @airbrake_project_setting.save
@@ -19,4 +19,8 @@ class AirbrakeProjectSettingsController < ::ApplicationController
     @project = Project.find(params[:id])
   end
 
+  def find_airbrake_setting
+    @airbrake_project_setting = @project.airbrake_settings || AirbrakeProjectSetting.new(project: @project)
+  end
+
 end

data/app/helpers/airbrake_helper.rb

@@ -3,13 +3,23 @@ module AirbrakeHelper
   def format_table(data)
     lines = []
     data.each do |key, value|
+      next unless value.is_a?(String)
       lines << "|@#{key}@|#{value.strip.blank? ? value : "@#{value}@"}|"
     end
     lines.join("\n")
   end
 
+  def format_log(data)
+    lines = []
+    data.each do |log|
+      next unless log.is_a?(Hash)
+      lines << "[#{log[:time].strftime('%F %T')}] #{log[:line]}"
+    end
+    lines.join("\n")
+  end
+
   def format_list_item(name, value)
-    return '' if value.to_s.strip.blank?
+    return '' if value.blank?
     "* *#{name}:* #{value}"
   end
 

data/app/views/airbrake/_issue_description.erb

@@ -14,27 +14,37 @@ h2. Request:
 <%=format_list_item('Action', @notice.request[:action]) %>
 
 <% if @notice.request[:params].present? %>
-h2. Parameters: 
+h2. Parameters:
 
 <%=format_table(@notice.request[:params]) %>
 <% end %>
 
 <% if @notice.request[:cgi_data].present? %>
-h2. Headers: 
+h2. Headers:
 
 <%=format_table(@notice.request[:cgi_data]) %>
 <% end %>
 
+<% log = @notice.request[:session].delete(:log) if @notice.request[:session].present? %>
 <% if @notice.request[:session].present? %>
-h2. Session: 
+h2. Session:
 
 <%=format_table(@notice.request[:session]) %>
 <% end %>
+
+<% if log.present? %>
+h2. Log:
+
+<pre>
+<%=format_log(log) %>
+</pre>
+<% end %>
 <% end %>
 
 <% if @notice.env.present? %>
 h2. Environment
 
+<%=format_list_item('Name', @notice.env[:environment_name]) %>
 <%=format_list_item('Directory', @notice.env[:project_root]) %>
 <%=format_list_item('Hostname', @notice.env[:hostname]) %>
 <% end %>

data/lib/redmine_airbrake_backend/notice.rb

@@ -34,10 +34,13 @@ module RedmineAirbrakeBackend
       raise NoticeInvalid if (notifier = convert_element(notice.at('notifier'))).blank?
 
       raise NoticeInvalid if (error = convert_element(notice.at('error'))).blank?
-      raise NoticeInvalid if error[:class].blank? || error[:message].blank?
-      error[:backtrace] = error[:backtrace][:line].is_a?(Array) ? error[:backtrace][:line] : [error[:backtrace][:line]] unless error[:backtrace].nil?
+      raise NoticeInvalid if error[:message].blank?
+
+      error[:backtrace] = format_backtrace(error[:backtrace])
 
       request = convert_element(notice.at('request'))
+      request[:session][:log] = format_session_log(request[:session][:log]) if request[:session].present?
+
       env = convert_element(notice.at('server-environment'))
 
       new(version, params, notifier, error: error, request: request, env: env)
@@ -81,5 +84,25 @@ module RedmineAirbrakeBackend
       key.to_s.gsub(/-/, '_')
     end
 
+    def self.ensure_hash_array(data)
+      d = (data.is_a?(Array) ? data : [data]).compact
+      d.reject!{|e| !e.is_a?(Hash)}
+      d.blank? ? nil : d
+    end
+
+    def self.format_backtrace(backtrace)
+      ensure_hash_array(backtrace)
+    end
+
+    def self.format_session_log(log)
+      log = JSON.parse(log) rescue nil
+      return nil unless log = ensure_hash_array(log)
+
+      log.map!{|l| l.symbolize_keys!; l[:time] = (Time.parse(l[:time]) rescue nil); l}
+      log.reject!{|l| l[:time].blank?}
+
+      log.blank? ? nil : log
+    end
+
   end
 end

data/lib/redmine_airbrake_backend/version.rb

@@ -1,3 +1,3 @@
 module RedmineAirbrakeBackend
-  VERSION = '0.2.4'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails