errlog 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd26baa17726137322c3d5df046b9cbcdffd189
-  data.tar.gz: d4cc1c6f7e80b69c68b35c3f2b616588ca6cbc52
+  metadata.gz: 6ed0cb0ec70f924ad34f237159636c0ab7c54b98
+  data.tar.gz: 1ba8e06be7edb9311ec15efbcc98f503a108b75f
 SHA512:
-  metadata.gz: 8ff796221f1b57d49247a1905a8ca00abb2e55119fe574a0fbeb38a771f331bf2c496de08c49557122fbcdfffe44c3b29a06a82141aeca5d6c04d585e30480e0
-  data.tar.gz: a74925cff35f45f5d496892413e64a2c28f83c04e91275e60b814d73a2c75c6b5270e2dd27aa55b5524ffca173dbfc9a41d982de05ce10c6ec19cbbe0fd478da
+  metadata.gz: 124b650da5d3e9fc1653407ca024177a2ec74a7515f5f5a2de6e2932e8e0ec9494298dda969f29b598fd58c4cbb83e6ce108d4c7982deb1db2af0f98d4bc9293
+  data.tar.gz: 9d0acde00ad38e9821024471f8dc4d785de77fa969b03dbf969d43172bcc77e9b82909285eaf93f6873f69ebba93cf15e787b175f2da9cefdb12aa4d975141ce

data/bin/errlogr

@@ -11,7 +11,7 @@ Errlog reporting tool (visit http://errlog.com for details)
 
 Usage:
 
-  errlog [params] "text to report"
+  errlogr [params] "text to report"
 
 Parameters
 

data/lib/errlog.rb

@@ -9,6 +9,10 @@ require 'thread'
 require 'httpclient'
 require 'weakref'
 
+if defined?(Rails)
+  require 'errlog/rails_controller_extensions'
+end
+
 module Errlog
 
   include Errlog::Constants

data/lib/errlog/context.rb

@@ -22,6 +22,14 @@ module Errlog
       report "#{e.class.name}: #{e.to_s}", Errlog::ERROR
     end
 
+    def report_warning text, &block
+      report text, Errlog::WARNING, &block
+    end
+
+    def report_trace text, &block
+      report text, Errlog::TRACE, &block
+    end
+
     def report text, severity = Errlog::ERROR, &block
       raise 'Errlog is not configured. Use Errlog.config' unless Errlog.configured?
       !self.app_name and self.app_name = Errlog.app_name

data/lib/errlog/rails_controller_extensions.rb

@@ -0,0 +1,92 @@
+module Errlog
+  module ControllerFilter
+
+    def self.included base
+      base.send :prepend_around_filter, :errlog_exceptions_trap
+      base.send :helper_method, :errlog_context
+      base.send :helper_method, :errlog_report
+      base.send :helper_method, :errlog_collect_context
+      base.send :helper_method, :errlog_exception
+      true
+    end
+
+    def errlog_context
+      @errlog_context || Errlog.clear_context
+    end
+
+    def errlog_exceptions_trap
+      ctx = @errlog_context = Errlog.clear_context
+
+      rl  = Rails.logger = ctx.create_logger Rails.logger
+      acl = ActionController::Base.logger = ctx.create_logger ActionController::Base.logger
+      arl = nil
+      if defined?(ActiveRecord)
+        arl = ActiveRecord::Base.logger = ctx.create_logger ActiveRecord::Base.logger
+      end
+
+      yield
+
+    rescue Exception => e
+      errlog_collect_context ctx
+      ctx.report_exception e
+      raise
+
+    ensure
+      Rails.logger                  = rl.prev_logger
+      ActionController::Base.logger = acl.prev_logger
+      arl and ActiveRecord::Base.logger = arl.prev_logger
+      true
+    end
+
+    def errlog_exception e, context = nil
+      errlog_collect_context(context).report_exception e
+    end
+
+    def errlog_report text, severity = Errlog::ERROR, context=nil
+      errlog_collect_context(context).report text, severity
+    end
+
+    def errlog_collect_context ctx=nil
+      ctx ||= errlog_context
+      ctx.component = request.path
+      ctx.params    = params
+      headers       = {}
+      request.headers.to_hash.each { |k, v|
+        next if k =~ /cookie/i || v.class.name =~ /cookie/i
+        res = nil
+        case v
+          when Hash
+            res = {}
+            v.each { |k, v| res[k] = v.to_s }
+          when Array;
+            res = v.map &:to_s
+          #when StringIO, IO
+          #  next
+          else
+            res = v.to_s
+        end
+        headers[k.to_s] = res
+      }
+      ctx.headers = headers
+      if respond_to?(:current_user)
+        ctx.current_user = if current_user
+                             res = [current_user.id]
+                             res << current_user.email if current_user.respond_to? :email
+                             res << current_user.full_name if current_user.respond_to? :full_name
+                             res
+                           else
+                             "not logged in"
+                           end
+      end
+      ctx.url = request.url
+      ctx.remote_ip = request.remote_ip
+      if request.url =~ %r|^https?://(.+?)[/:]|
+        ctx.application = $1
+      end
+      ctx
+    end
+
+  end
+end
+
+ActionController::Base.send :include, Errlog::ControllerFilter

data/lib/errlog/version.rb

@@ -1,3 +1,3 @@
 module Errlog
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errlog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - sergeych
@@ -102,6 +102,7 @@ files:
 - lib/errlog/constants.rb
 - lib/errlog/context.rb
 - lib/errlog/packager.rb
+- lib/errlog/rails_controller_extensions.rb
 - lib/errlog/version.rb
 - spec/errlog_spec.rb
 - spec/packager_spec.rb