logworm_amqp 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.9.2
+    Adds support for attaching extra data to log entries (via log_with_request). The main purpose is to allow users to add their own
+    data to the automatically-generated web_log log.
+    Renames (or, rather, aliases for now) lw_log to log_in
+    
 v0.9.1
     Explicitly state dependency on minion 0.1.15
 v0.9.0

data/Manifest

@@ -13,4 +13,3 @@ lib/cmd/compute.rb
 lib/cmd/tail.rb
 lib/logworm_amqp.rb
 lib/logworm_utils.rb
-logworm_amqp.gemspec

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm_amqp', '0.9.1') do |p|
+Echoe.new('logworm_amqp', '0.9.2') do |p|
   p.description = "logworm - logging service"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/client/logger.rb

@@ -5,6 +5,7 @@ module Logworm
 
   class Logger
     $lr_queue = []
+    $attaches = {}
     
     ###
     # Use connection to the backend servers specified in environment variable or config file
@@ -46,11 +47,7 @@ module Logworm
       return unless values.is_a? Hash
 
       # Turn keys into symbols, delete empty ones, rename conflicting ones
-      kvalues = values.delete_if {|k,v| k.to_s == ""}.map {|k,v| [k.to_sym, v]}
-      kvalues = Hash[*kvalues.flatten]
-      [:_ts, :_ts_utc, :_request_id].each do |k|
-        kvalues["orig_#{k}".to_sym] = kvalues[k] if kvalues.has_key? k
-      end
+      kvalues = cleanup(values)
       
       # Add information
       ts = Time.now.utc
@@ -61,6 +58,18 @@ module Logworm
       # Enqueue
       $lr_queue << [table, kvalues]
     end
+    
+    ###
+    # Allows to add fields to ALL log entries that go to a particular table.
+    # Can be used, for example, to add user-level and app-specific data to the :web_log log
+    # Notice that it overwrites previously attached fields. For example
+    #  attach_to_log(:xx, {:a = 1})
+    #  attach_to_log(:xx, {:a = 2})
+    # will end up attaching just :a => 2 to every :xx log
+    ###
+    def self.attach_to_log(table, values = {})
+      $attaches[table] = ($attaches[table] ? $attaches[table].merge(values) : values)
+    end
 
     ###
     # Sends the entries to the server, if configured
@@ -82,6 +91,12 @@ module Logworm
         return [0,0]
       end
       
+      # Apply a-posteriori attachments
+      # It merges, and so that attachment may overwrite 
+      $lr_queue.each do |le|
+        le[1].merge!($attaches[le[0]]) if $attaches[le[0]]
+      end
+      
       startTime = Time.now
       $lw_server.batch_log($lr_queue.to_json)
       $lr_queue = [] 
@@ -89,5 +104,16 @@ module Logworm
       
       [to_send, (endTime - startTime)]
     end
+    
+    private
+    # Turn keys into symbols, delete empty ones, rename conflicting ones
+    def self.cleanup(values)
+      kvalues = {}
+      values.each {|k,v| kvalues[k.to_sym] = v unless k.to_s == ""}
+      [:_ts, :_ts_utc, :_request_id].each do |k|
+        kvalues["orig_#{k}".to_sym] = kvalues[k] if kvalues.has_key? k
+      end
+      kvalues
+    end
   end
 end

data/lib/logworm_amqp.rb

@@ -9,6 +9,12 @@ require File.dirname(__FILE__) + '/client/rails'
 def lw_log (logname, values)
   Logworm::Logger.log(logname, values)
 end
+alias :log_in :lw_log
+
+def lw_with_log(values)
+  Logworm::Logger.attach_to_log(:web_log, values)
+end
+alias :log_with_request :lw_with_log
 
 ###
 # Perform a query against the logworm server

data/logworm_amqp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_amqp}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-11}
   s.description = %q{logworm - logging service}
   s.email = %q{schapira@pomelollc.com}
   s.executables = ["lw-compute", "lw-tail"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logworm_amqp
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency