madvertise-logging 1.0.0.rc2 → 1.0.0.rc3

data/lib/madvertise/logging/improved_logger.rb

@@ -319,17 +319,36 @@ module Madvertise
       #
       class Formatter
 
-        @format = "%s %s(%d) [%s] %s\n"
+        @format = "%{time} %{progname}(%{pid}) [%{severity}] %{msg}\n"
+        @time_format = "%Y-%m-%d %H:%M:%S.%N"
 
         class << self
           # Format string for log messages.
           attr_accessor :format
+
+          # Format string for timestamps in log messages.
+          attr_accessor :time_format
         end
 
+        RUBY2SYSLOG = {
+          :debug => 7,
+          :info => 6,
+          :warn => 4,
+          :error => 3,
+          :fatal => 2,
+          :unknown => 3,
+        }
+
         # @private
         def call(severity, time, progname, msg)
-          time = time.strftime("%Y-%m-%d %H:%M:%S.%N")
-          self.class.format % [time, progname, $$, severity, msg.to_s]
+          self.class.format % {
+            :time => time.strftime(self.class.time_format),
+            :progname => progname,
+            :pid => $$,
+            :severity => severity,
+            :syslog_severity => RUBY2SYSLOG[severity.downcase.to_sym],
+            :msg => msg.to_s,
+          }
         end
       end
 

data/lib/madvertise/logging/version.rb

@@ -1,6 +1,6 @@
 module Madvertise
   module Logging
     # @private
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.0.0.rc3"
   end
 end

data/spec/improved_logger_spec.rb

@@ -85,12 +85,12 @@ describe ImprovedLogger do
 
     it "logs an exception object" do
       logger.exception(exc)
-      subject.last[:message].should == "exception class=RuntimeError reason=\"Test error\" message= backtrace=\"['/home/jdoe/app/libexec/app.rb:1:in `foo'']\""
+      subject.last[:message].should match(%r{exception class=RuntimeError reason=\"Test error\" message= backtrace=\"\['/home/jdoe/app/libexec/app\.rb:1:in `foo''\]\"})
     end
 
     it "logs an exception object and prefix" do
       logger.exception(exc, "app failed to foo")
-      subject.last[:message].should == "exception class=RuntimeError reason=\"Test error\" message=\"app failed to foo\" backtrace=\"['/home/jdoe/app/libexec/app.rb:1:in `foo'']\""
+      subject.last[:message].should match(%r{exception class=RuntimeError reason=\"Test error\" message=\"app failed to foo\" backtrace=\"\['/home/jdoe/app/libexec/app\.rb:1:in `foo''\]\"})
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-logging
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies: []
 description: Advanced logging classes with buffer backend, transactions, multi logger,
   etc
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3712847879214537117
+      hash: 4043118635048299053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: