logjam_agent 0.1.1 → 0.1.2

data/lib/logjam_agent/buffered_logger.rb

@@ -34,15 +34,12 @@ module LogjamAgent
     def add(severity, message = nil, progname = nil, &block)
       return if @level > severity
       message = (message || (block && block.call) || '').to_s
-      # If a newline is necessary then create a new message ending with a newline.
-      # Ensures that the original message is not mutated.
-      message = "#{message}\n" unless message[-1] == ?\n
       time = Time.now
-      buffer << formatter.call(severity, time, progname, message)
+      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[0..-2])
+        request.add_line(severity, time, message)
       end
       message
     end

data/lib/logjam_agent/syslog_like_formatter.rb

@@ -20,20 +20,20 @@ module LogjamAgent
       timestamp.strftime("%b %d %H:%M:%S.#{timestamp.usec}")
     end
 
-    def format_msg(msg)
-      "#{msg}".sub(/^[\s\n]+/, '').sub(/[\s\n]+$/,"\n")
+    def format_message(msg)
+      msg.strip
     end
 
     def call(severity, timestamp, progname, msg)
-      "#{format_severity(severity)} #{format_time(timestamp)} #{@hostname} #{progname||@app_name}[#{$$}]#{render_extra_attributes}: #{format_msg(msg)}"
+      "#{format_severity(severity)} #{format_time(timestamp)} #{@hostname} #{progname||@app_name}[#{$$}]#{render_extra_attributes}: #{format_message(msg)}"
     end
 
     def render_extra_attributes
-      (self.extra_attributes||[]).map{|key, value| " #{key}[#{value}]"}
+      (@extra_attributes || []).map{|key, value| " #{key}[#{value}]"}.join
     end
 
     def add_extra_attributes(attributes)
-      (self.extra_attributes ||= []).concat(attributes)
+      (@extra_attributes ||= []).concat(attributes)
     end
   end
 end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

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