dohlog 0.1.7 → 0.1.8

data/lib/doh/log/append_acceptor.rb

@@ -0,0 +1,22 @@
+module DohLog
+
+class AppendAcceptor
+  def initialize(acceptor, &pred)
+    @acceptor = acceptor
+    @pred = pred
+  end
+
+  def add(event)
+    extras_to_add = @pred.call(event)
+    if extras_to_add
+      event.extras.merge!(extras_to_add)
+    end
+    @acceptor.add(event)
+  end
+
+  def shutdown
+    @acceptor.shutdown
+  end
+end
+
+end

data/lib/doh/log/email_acceptor.rb

@@ -4,36 +4,24 @@ module DohLog
 
 class EmailAcceptor
   # required config fields are :from, :to, :server
-  def initialize(config, &get_details)
+  def initialize(config)
     @config = config
-    @get_details = get_details
     @msg_start = "From:#{config[:from]}\nTo:#{config[:to].join(', ')}\nContent-Type: text/plain\nSubject:"
   end
 
   def add(event)
-    msg = "#{@msg_start}#{event.severity_text}: #{event.msg}\n\n#{event.summary}\n#{details_text}\n#{event.exception_text}"
+    msg = "#{@msg_start}#{event.severity_text}: #{event.msg}\n\n#{event.summary}\n#{event.exception_text}"
     Net::SMTP.start(@config[:server]) do |smtp|
       begin
         smtp.send_message(msg, @config[:from], @config[:to])
       rescue => excpt
-        puts "dohlog EmailAcceptor send failed: #{excpt}"
+        $stderr.puts "DohLog EmailAcceptor send failed: #{excpt}"
       end
     end
   end
 
   def shutdown
   end
-
-private
-  def details_text
-    map = @get_details.call
-    lines = []
-    map.each_pair do |key, value|
-      lines << "#{key}: #{value}"
-    end
-    lines.join("\n")
-  end
-
 end
 
 end

data/lib/doh/log/event.rb

@@ -3,10 +3,11 @@ require 'doh/log/severity'
 module DohLog
 
 class Event
-  attr_accessor :severity, :msg, :location, :exception, :time
+  attr_accessor :severity, :msg, :location, :exception, :extras, :time
 
   def initialize(severity, msg, location = '', exception = nil)
     @severity, @msg, @location, @exception = severity, msg, location, exception
+    @extras = {}
     @time = Time.now
   end
 
@@ -33,7 +34,16 @@ class Event
   end
 
   def summary
-    "#{datetime_text} [#{severity_text}] (#{location}) : #{msg}"
+    if @extras.empty?
+      extra_str = ''
+    else
+      extra_ary = []
+      @extras.each_pair do |key, value|
+        extra_ary << "#{key}: #{value}"
+      end
+      extra_str = "<#{extra_ary.join(', ')}> "
+    end
+    "#{datetime_text} [#{severity_text}] (#{location}) #{extra_str}: #{msg}"
   end
 end
 

data/lib/doh/log/filter_acceptor.rb

@@ -1,14 +1,17 @@
 module DohLog
 
 class FilterAcceptor
-  def initialize(acceptor, &pred)
+  def initialize(acceptor, else_acceptor = nil, &pred)
     @acceptor = acceptor
+    @else_acceptor = else_acceptor
     @pred = pred
   end
 
   def add(event)
     if @pred.call(event)
       @acceptor.add(event)
+    elsif @else_acceptor
+      @else_acceptor.add(event)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohlog
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
@@ -37,6 +37,7 @@ extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
 files:
+- lib/doh/log/append_acceptor.rb
 - lib/doh/log/email_acceptor.rb
 - lib/doh/log/event.rb
 - lib/doh/log/filter_acceptor.rb