logworm_amqp 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,4 +1,12 @@
-v.9.4
+v0.9.5
+  A few changes:
+     - Add support for log_environments(arr) configuration, to specify a list of environments in which logworm should log
+       (thanks to Erik Hanson @ Top Prospect)
+     - Fixed problems with request.path and request.status on Rails 2.3.x
+       (thanks to Andrew Cove @ getaquirk.com)
+     - The db server now specifies a PREFIX for AMQP queue names, to make debugging easier (e.g., to send msgs to lw-staging)
+     
+v0.9.4
 	Minor timeout changes to production environment
 	
 v0.9.3

data/Rakefile

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

data/lib/base/db.rb

@@ -115,6 +115,7 @@ module Logworm
           resp = db_call(:get, "#{host_with_protocol}/amqp_url")
           @amqp_url = resp["url"]
           @stats_freq = resp["stats_freq"]
+          @amqp_prefix = resp["prefix"] || "lw"
           $stderr.puts "logworm server acquired: #{@amqp_url.gsub(/[^@]+@/, "amqp://")}"
           Minion.amqp_url = @amqp_url
           reset_stats
@@ -130,7 +131,7 @@ module Logworm
        if get_amqp_url
          content = payload.to_json
          sig= signature(content, @token_secret )
-         Minion.enqueue(queue, {:payload => content, :consumer_key => @token, :signature => sig, 
+         Minion.enqueue("#{@amqp_prefix}.#{queue}", {:payload => content, :consumer_key => @token, :signature => sig, 
                                 :env => ENV['RACK_ENV'] || "?"})
        end
     end
@@ -152,7 +153,7 @@ module Logworm
     def push_stats()
       avg = sprintf('%.6f', (@total_time / @tock)).to_f
       len = sprintf('%.2f', (Time.now - @sampling_start)).to_f
-      to_amqp("lw.stats", {:avg => avg , :max => @amqp_max, :min => @amqp_min, 
+      to_amqp("stats", {:avg => avg , :max => @amqp_max, :min => @amqp_min, 
                            :total => @total_time, :count => @tock, :sampling_length => len})
       $stderr.puts "logworm statistics: #{@tock} messages sent in last #{len} secs. Times: #{avg * 1000}/#{@amqp_min * 1000}/#{@amqp_max * 1000} (avg/min/max msecs)"
        reset_stats
@@ -166,7 +167,7 @@ module Logworm
   
     def batch_log(entries)
       recording_stats do
-        to_amqp("lw.logging", {:entries => entries})
+        to_amqp("logging", {:entries => entries})
       end
     end
 

data/lib/client/rack.rb

@@ -8,13 +8,14 @@ module Logworm
       
       @log_requests = (options[:donot_log_requests].nil? or options[:donot_log_requests] != true)
       @log_headers  = (options[:log_headers] and options[:log_headers] == true)
-      @dev_logging  = (options[:log_in_development] and options[:log_in_development] == true)
+      @log_envs     = options[:log_environments] || ["production"]
+      @log_envs << "development" if (options[:log_in_development] and options[:log_in_development] == true) # backwards compatibility
       Logger.use_default_db
       @timeout = (ENV['RACK_ENV'] == 'production' ? 1 : 5) 
     end
 
     def call(env)
-      return @app.call(env) unless (ENV['RACK_ENV'] == 'production' or (ENV['RACK_ENV'] == 'development' and @dev_logging))
+      return @app.call(env) unless @log_envs.include?(ENV['RACK_ENV'])
 
       Logger.start_cycle
       begin
@@ -30,7 +31,7 @@ module Logworm
     private 
     def log_request(env, status, response_headers, appTime)
       method       = env['REQUEST_METHOD']
-      path         = (env['REQUEST_PATH'].nil? or env['REQUEST_PATH'] == "")  ? "/" : env['REQUEST_PATH']
+      path         = env['PATH_INFO'] || env['REQUEST_PATH'] || "/"
       ip           = env['REMOTE_ADDR']
       http_headers = env.reject {|k,v| !(k.to_s =~ /^HTTP/) }
       queue_size   = env['HTTP_X_HEROKU_QUEUE_DEPTH'].nil? ? -1 : env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i

data/lib/client/rails.rb

@@ -7,13 +7,13 @@
 if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STRING < "3.0.0"
 
   require 'benchmark'
-
+  
   ActionController::Base.class_eval do
     ## Basic settings: log requests, without headers. Use default db, and timeout after 1 second
     @@log_requests = true
     @@log_headers  = false
-    @@dev_logging  = false
-    @@timeout = (RAILS_ENV == 'production' ? 1 : 5) 
+    @@log_envs     = ["production"]
+    @@timeout      = (RAILS_ENV == 'production' ? 1 : 5) 
     Logworm::Logger.use_default_db
     
     ###
@@ -35,8 +35,12 @@ if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STR
     ###
     # Turn on logging in development mode
     ###
-    def self.log_in_development
-      @@dev_logging = true
+    def self.log_in_development # Kept for backwards compatibility
+      @@log_envs << "development"
+    end
+    
+    def self.log_environments(*envs)
+      @@log_envs = envs
     end
     
     ###
@@ -44,9 +48,7 @@ if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STR
     # Call the original method, logs the request unless disabled, and flushes the logworm list
     ###
     def process_with_logworm_log(request, response, method = :perform_action, *arguments)
-      unless (RAILS_ENV == 'production' or (RAILS_ENV == 'development' and @@dev_logging))
-        return process_without_logworm_log(request, response, method, *arguments) 
-      end
+      return process_without_logworm_log(request, response, method, *arguments) unless @@log_envs.include?(RAILS_ENV)
       
       Logworm::Logger.start_cycle
       begin
@@ -64,10 +66,10 @@ if defined?(ActionController) and Rails::VERSION::STRING and Rails::VERSION::STR
     private
     def log_request(request, response, appTime)
       method       = request.env['REQUEST_METHOD']
-      path         = request.env['REQUEST_PATH'].blank? ? "/" : request.env['REQUEST_PATH']
+      path         = request.path.blank? ? "/" : request.path
       ip           = request.env['REMOTE_ADDR']
       http_headers = request.headers.reject {|k,v| !(k.to_s =~ /^HTTP/) }
-      status       = response.status[0..2]
+      status       = response.status ? (response.status.is_a?(String) ? response.status[0..2].to_i : response.status.to_s.to_i) : -1
       queue_size   = request.env['HTTP_X_HEROKU_QUEUE_DEPTH'].blank? ? -1 : request.env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_i
 
       entry = { :summary         => "#{method} #{path} - #{status} #{appTime}", 

data/logworm_amqp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm_amqp}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   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-18}
+  s.date = %q{2010-08-19}
   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: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -04:00
+date: 2010-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency