logjam_agent 0.1.3 → 0.2.0

data/lib/logjam_agent/amqp_forwarder.rb

@@ -23,7 +23,7 @@ module LogjamAgent
     end
 
     # TODO: mutex!
-    def send(msg, engine)
+    def forward(msg, engine)
       return if paused? || LogjamAgent.disabled
       begin
         # $stderr.puts msg

data/lib/logjam_agent/buffered_logger.rb

@@ -14,33 +14,39 @@ module LogjamAgent
       @formatter = lambda{|_, _, _, message| message}
     end
 
+    def request
+      Thread.current[:logjam_request]
+    end
+
+    def request=(request)
+      Thread.current[:logjam_request] = request
+    end
+
     def start_request(app, env, initial_fields={})
-      Thread.current[:logjam_request] = Request.new(app, env, self, initial_fields)
+      self.request = Request.new(app, env, self, initial_fields)
     end
 
     def finish_request(additional_fields={})
-      # puts "finishing request"
       if request = self.request
         request.fields.merge!(additional_fields)
-        Thread.current[:logjam_request] = nil
+        self.request = nil
         request.forward
       end
     end
 
-    def request
-      Thread.current[:logjam_request]
-    end
-
     def add(severity, message = nil, progname = nil, &block)
       return if @level > severity
-      message = (message || (block && block.call) || '').to_s
+      request = self.request
+      if message.is_a?(Exception)
+        request.add_exception(message) if request
+        message = format_exception(message)
+      else
+        message = (message || (block && block.call) || '').to_s
+      end
       time = Time.now
       buffer << formatter.call(severity, time, progname, message) << "\n"
       auto_flush
-      if request = self.request
-        # puts "adding line to request"
-        request.add_line(severity, time, message)
-      end
+      request.add_line(severity, time, message) if request
       message
     end
 
@@ -48,5 +54,17 @@ module LogjamAgent
       raise "cannot connect logger to new log device" unless log_device.respond_to?(:write)
       @log = log_device
     end
+
+    private
+
+    def format_exception(exception)
+      msg = "#{exception.class} : #{exception.message}"
+      if backtrace = exception.backtrace
+        backtrace = Rails.backtrace_cleaner.clean(backtrace, :all) if defined?(Rails)
+        msg << "\n  #{backtrace.join("\n  ")}"
+      else
+        msg
+      end
+    end
   end
 end

data/lib/logjam_agent/forwarders.rb

@@ -15,5 +15,9 @@ module LogjamAgent
     def reset
       @@forwarders.each_value {|f| f.reset}
     end
+
+    def inspect
+      super + ": #{@@forwarders.inspect}"
+    end
   end
 end

data/lib/logjam_agent/request.rb

@@ -18,9 +18,13 @@ module LogjamAgent
       @lines << [severity, format_time(timestamp), message.strip]
     end
 
+    def add_exception(exception)
+      ((@fields[:exceptions] ||= []) << exception.class.to_s).uniq!
+    end
+
     def forward
       engine = @fields.delete(:engine)
-      @forwarder.send(@fields.to_json, engine)
+      @forwarder.forward(@fields.to_json, engine)
     rescue Exception => e
       handle_forwarding_error(e)
     end
@@ -29,7 +33,7 @@ module LogjamAgent
 
     def format_time(t)
       # iso time with microseconds
-      t.strftime("%Y-%m-%dT%H:%M:%S.#{t.usec}")
+      t.strftime("%Y-%m-%dT%H:%M:%S.#{"%06d" % t.usec}")
     end
 
     def handle_forwarding_error(exception)

data/lib/logjam_agent/syslog_like_formatter.rb

@@ -17,7 +17,7 @@ module LogjamAgent
     end
 
     def format_time(timestamp)
-      timestamp.strftime("%b %d %H:%M:%S.#{timestamp.usec}")
+      timestamp.strftime("%b %d %H:%M:%S.#{"%06d" % timestamp.usec}")
     end
 
     def format_message(msg)

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 +02:00
+date: 2011-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency