droid 0.9.3 → 0.9.5

data/lib/droid.rb

@@ -11,6 +11,7 @@ require 'bunny'
 require File.dirname(__FILE__) + '/utilization'
 
 class Droid
+	DEFAULT_TTL = 300
 
 	class BadPayload < RuntimeError; end
 
@@ -137,21 +138,20 @@ class Droid
 
 		payload[:event_hash] ||= new_event_hash
 		payload[:published_on] = options[:published_on] || Time.now.getgm.to_i
-		payload[:ttl] ||= (options[:ttl].to_i || DEFAULT_TTL)
+		payload[:ttl] ||= (options[:ttl] || DEFAULT_TTL).to_i
 
 		payload.to_json
 	end
 
 	def self.publish(key, payload, options={})
+		payload[:message_id] = new_event_hash
 		res =
 			reconnect_on_error do
 				exchange.publish(payload_to_data(payload, options), :key => key, :immediate => options[:immediate])
 			end
 
 		unless options[:log] == false
-			Log.notice "#{key} published #{payload_summary(payload)}",
-				:event_hash => payload[:event_hash],
-				:addendum => payload.inspect
+			Log.notice "amqp_message action=published key=#{key} #{payload_summary(payload)}"
 		end
 
 		res
@@ -168,10 +168,9 @@ class Droid
 		return ' -> (empty payload)' if payload.empty?
 		resume = payload.map do |k, v|
 			v = v.to_s
-			v = v[0..17] + '...' if v.size > 20
+			v = v[0..37] + '...' if v.size > 40
 			"#{k}=#{v}"
-		end[0,15].join(', ')
-		resume << " (and #{payload.size - 15} more)" if payload.size > 15
+		end.join(", ")
 		" -> #{resume}"
 	end
 
@@ -296,8 +295,6 @@ class Droid
 	def periodic_timer(duration, now=false, &bk) ; self.class.periodic_timer(duration, now, &bk) ; end
 
 	class Basic
-		DEFAULT_TTL = 300
-
 		def initialize(droid, options={})
 			@droid = droid
 		end
@@ -367,7 +364,7 @@ class Droid
 				stderr_puts "About to log error #{headers[:event_hash]}"
 				stderr_puts e.message
 				stderr_puts msg
-				Log.error e.message, :addendum => msg, :event_hash => headers[:event_hash], :exception => e
+				Log.error "amqp_message action=error class='#{e.class}' message='#{e.message}'", :exception => e
 				@droid.error_handler.call(@message, e, self) if @droid.error_handler
 			rescue Exception => e
 				stderr_puts "error handling error! #{e.inspect}"
@@ -412,22 +409,22 @@ class Droid
 						end
 
 						ttl = headers[:ttl]
-						now = Time.now.getgm.to_i
+						start = Time.now.getgm.to_i
 						published_on = headers[:published_on]
+						age = start - published_on
 
-						Log.notice "#{@key} received #{payload_summary(params)}"
+						Log.notice "amqp_message action=received key=#{@key} ttl=#{ttl} age=#{age} #{payload_summary(params)}"
 
-						if ttl == -1 or now <= (published_on + ttl)
+						if (ttl == -1) or (age <= ttl)
 							@droid.before_filter.call(*callargs) if @droid.before_filter
 							blk.call(*callargs)
+
+							finished = Time.now.getgm.to_i
+							Log.notice "amqp_message action=processed key=#{@key} elapsed=#{finished-start} ttl=#{ttl} age=#{age} #{payload_summary(params)}"
 						else
-							Log.error "#{@key} message timeout", :addendum => payload_summary(params)
+							Log.error "amqp_message action=timeout key=#{@key} ttl=#{ttl} age=#{age} #{payload_summary(params)}"
 							info.ack if opts[:ack]
 						end
-
-						duration = Time.now.getgm.to_i - now
-
-						Log.notice "(#{duration} seconds) SLOW AMQP #{@key} #{payload_summary(params)}" if duration > 3
 					rescue => e
 						error(e)
 					ensure
@@ -452,6 +449,7 @@ class Droid
 			payload[:ttl] = opts[:ttl]
 
 			newpayload = Droid.payload_to_data(payload, :published_on => (headers[:published_on] || now))
+			Log.notice("droid_requeue key=#{@key} #{payload_summary(newpayload)}")
 			@q.publish(newpayload)
 		end
 

data/lib/memcache_cluster.rb

@@ -8,9 +8,11 @@ require 'digest/sha1'
 module MemcacheCluster
 	extend self
 
+	HEROKU_NAMESPACE = '0Xfa15837Z' # heroku's internal memcache namespace
+
 	# A MemCache object configured with heroku's internal memcache namespace.
 	def heroku
-		cache('0Xfa15837Z')
+		cache(HEROKU_NAMESPACE)
 	end
 
 	def cache_retry(prefix, opts={})

data/vendor/logger_client/lib/logger_client.rb

@@ -165,7 +165,6 @@ module Log
 				dir = defined?(RAILS_ROOT) ? RAILS_ROOT : '.'
 				File.open("#{dir}/failsafe.log", "a") do |f|
 					f.puts "#{Time.now} #{params[:log][:level]} : #{params[:log][:message]}"
-					f.puts params[:log][:addendum] if params[:log][:addendum]
 				end
 			when :console, nil
 				console_log(params[:log][:message])
@@ -183,7 +182,7 @@ module Log
 			if opts[:exception]
 				msg += "\n" + format_syslog_exception(opts[:exception])
 			end
-			syslog_resource.log(level, '%s', msg)
+			syslog_resource.log(level, '%s', trim_syslog_msg(msg))
 		rescue Exception => e
 			failsafe(:log => { :level => 'error', :message => "could not log to syslog: #{e.class.name} #{e.message}"})
 			unless @retried
@@ -203,6 +202,11 @@ module Log
 		end
 	end
 
+	def trim_syslog_msg(msg)
+		return msg if msg.size < 800
+		msg[0, 796] + " ..."
+	end
+
 	def syslog_resource
 		@@syslog ||= Syslog.open(default_options[:component].to_s, Syslog::LOG_PID | Syslog::LOG_CONS, default_options[:syslog_facility] || Syslog::LOG_USER)
 	end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: droid
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: []
 
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -07:00
+date: 2010-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: amqp
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,11 +45,9 @@ dependencies:
   name: bunny
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,11 +57,9 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -95,10 +86,6 @@ files:
 - vendor/logger_client/lib/logger_client.rb
 - vendor/logger_client/test.rb
 - README.md
-- test/base.rb
-- test/droid_test.rb
-- test/heroku_droid_test.rb
-- test/wait_for_port_test.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -109,27 +96,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: droid
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: AMQP wrapper