logjam_agent 0.2.3 → 0.2.4

data/lib/logjam_agent.rb

@@ -28,4 +28,39 @@ module LogjamAgent
 
   mattr_accessor :disabled
   self.disabled = false
+
+  mattr_accessor :exception_classes
+  self.exception_classes = []
+
+  mattr_accessor :exception_matcher
+  self.exception_matcher = nil
+
+  def self.auto_detect_exception(exception_class)
+    # ignore Exception classes created with Class.new (timeout.rb, my old friend)
+    if (class_name = exception_class.to_s) =~ /^[\w:]+$/
+      exception_classes << class_name unless exception_classes.include?(class_name)
+    end
+  end
+
+  def self.reset_exception_matcher
+    self.exception_matcher = Regexp.new(self.exception_classes.map{|e| Regexp.escape(e)}.join("|"))
+  end
+
+  def self.determine_loaded_exception_classes
+    ObjectSpace.each_object(Class) do |klass|
+      auto_detect_exception(klass) if klass < Exception
+    end
+    reset_exception_matcher
+  end
+
+  def self.auto_detect_logged_exceptions
+    determine_loaded_exception_classes
+    Exception.class_eval <<-"EOS"
+      def self.inherited(subclass)
+        ::LogjamAgent.auto_detect_exception(subclass)
+        ::LogjamAgent.reset_exception_matcher
+      end
+    EOS
+  end
+
 end

data/lib/logjam_agent/buffered_logger.rb

@@ -42,8 +42,8 @@ module LogjamAgent
         message = format_exception(message)
       else
         message = (message || (block && block.call) || '').to_s
-        if request && severity >= Logger::ERROR && (ex = detect_logged_exception(message))
-          request.add_exception(ex)
+        if request && severity >= Logger::ERROR && (e = detect_logged_exception(message))
+          request.add_exception(e)
         end
       end
       time = Time.now
@@ -58,48 +58,17 @@ module LogjamAgent
       @log = log_device
     end
 
-    @@exception_classes = []
-    def self.auto_detect_exception(exception_class)
-      # but ignore Exception classes created with Class.new (timeout.rb, my old friend)
-      if (class_name = exception_class.to_s) =~ /^[\w:]+$/
-        @@exception_classes << class_name
-      end
-    end
-
-    @@exception_matcher = nil
-    def self.reset_exception_matcher
-      @@exception_matcher = Regexp.new(@@exception_classes.map{|e| Regexp.escape(e)}.join("|"))
-    end
-
-    def self.auto_detect_logged_exceptions
-      determine_loaded_exception_classes
-      Exception.class_eval <<-"EOS"
-        def self.inherited(subclass)
-          logger_class = ::LogjamAgent::BufferedLogger
-          logger_class.auto_detect_exception(subclass)
-          logger_class.reset_exception_matcher
-        end
-      EOS
-    end
-
     private
 
     def detect_logged_exception(message)
-      (matcher = @@exception_matcher) && message[matcher]
-    end
-
-    def self.determine_loaded_exception_classes
-      ObjectSpace.each_object(Class) do |klass|
-        auto_detect_exception(klass) if klass < Exception
-      end
-      reset_exception_matcher
+      (matcher = LogjamAgent.exception_matcher) && message[matcher]
     end
 
     def format_exception(exception)
-      msg = "#{exception.class} : #{exception.message}"
+      msg = "#{exception.class} (#{exception.message})"
       if backtrace = exception.backtrace
         backtrace = Rails.backtrace_cleaner.clean(backtrace, :all) if defined?(Rails)
-        msg << "\n  #{backtrace.join("\n  ")}"
+        msg << ":\n  #{backtrace.join("\n  ")}"
       else
         msg
       end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-24 00:00:00 +02:00
+date: 2011-09-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency