droid 0.9.0 → 0.9.1

data/README.md

@@ -0,0 +1,34 @@
+Droid - our AMQP wrapper
+========================
+
+Every instance type in the heroku cloud runs an agent, which we call a droid.  These report instance stats into opsdash, and give the instance a connection to our general AMQP backbone.
+
+Setup
+-----
+
+To use droid from an app or component, add the following to that app's Gemfile:
+
+    gem 'droid', VERSION
+
+Set VERSION to the [current version](http://rubygems.org/gems/droid).
+
+Legacy setup
+------------
+
+Our pre-gem was to check out droid into /usr/local/droid on all instance types.
+This is deprecated.
+
+Releasing a new droid gem
+-------------------------
+
+    $ gem install jeweler
+    $ echo "vX.X.X" > VERSION
+    $ rake build
+    $ git commit -am "vX.X.X"
+    $ git tag vX.X.X
+    $ git push origin master --tags
+    $ gem push pkg/droid-X.X.X.gem
+
+Then increment the version number in the Gemfile for any component that you
+wish to use the new version.
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: droid
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: []
 
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 -07:00
-default_executable: conf
+date: 2010-07-06 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -48,12 +48,12 @@ dependencies:
   version_requirements: *id002
 description: 
 email: 
-executables: 
-- conf
-extensions: []
+executables: []
 
-extra_rdoc_files: []
+extensions: []
 
+extra_rdoc_files: 
+- README.md
 files: 
 - lib/droid.rb
 - lib/droid/sync.rb
@@ -62,18 +62,15 @@ files:
 - lib/memcache_cluster.rb
 - lib/stats.rb
 - lib/utilization.rb
-- speaker/droid_speaker.rb
-- speaker/speak
-- speaker/test.rb
 - vendor/logger_client/Rakefile
 - vendor/logger_client/init.rb
 - vendor/logger_client/lib/logger_client.rb
 - vendor/logger_client/test.rb
-- test/heroku_droid_test.rb
+- README.md
 - test/base.rb
 - test/droid_test.rb
+- test/heroku_droid_test.rb
 - test/wait_for_port_test.rb
-- bin/conf
 has_rdoc: true
 homepage: 
 licenses: []
@@ -109,7 +106,7 @@ signing_key:
 specification_version: 3
 summary: AMQP wrapper
 test_files: 
-- test/heroku_droid_test.rb
 - test/base.rb
 - test/droid_test.rb
+- test/heroku_droid_test.rb
 - test/wait_for_port_test.rb

data/bin/conf

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'socket'
-
-def wait_for_tcp_port(port, options={})
-  options[:timeout] ||= 30
-  options[:host]    ||= "localhost"
-  
-  options[:timeout].times do
-    begin
-      x = TCPSocket.new(options[:host], port)
-      x.close
-      return
-    rescue
-      sleep 1
-      next
-    end
-  end
-
-  raise "#{options[:host]}:#{port} did not come up after #{options[:timeout]} seconds"
-end
-
-puts "Waiting for RabbitMQ"
-wait_for_tcp_port(5672)
-
-puts `rabbitmqctl add_vhost /heroku`
-
-%w[hermes core].each do |agent|
-  puts `rabbitmqctl add_user #{agent} thisisheroku!`
-  puts `rabbitmqctl set_permissions -p /heroku #{agent} \".*\" \".*\" \".*\"`
-end
-

data/speaker/droid_speaker.rb

@@ -1,79 +0,0 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/json_pure-1.1.3/lib'
-require 'json'
-require 'drb'
-require 'timeout'
-
-class DroidSpeaker
-
-	def self.drb_connect(port)
-		DRb.start_service()
-		@drb = DRbObject.new(nil,"druby://localhost:#{port}")
-	end
-
-	def self.drb_cast(topic, payload, &p) 
-		@drb.publish(topic, payload, &p)
-	end
-
-	def self.drb_call(topic, payload)
-		## this is the best stupid trick I could think of the force blocking
-		lock = Thread.new { sleep 9999 }
-		@r = nil
-		@drb.publish(topic, payload) do |result|
-			@r = result
-			lock.kill
-		end
-		lock.join
-		@r
-	end
-
-	def self.send(topic, payload, &p)
-		i = new
-		i.send(topic, payload, &p)
-		i.flush
-	end
-
-	def self.start
-		i = new
-		yield(i)
-		i.flush
-	end
-
-	def initialize
-		@message = nil
-		@callback = nil
-	end
-
-	def send(topic, payload, &blk)
-		if defined?(Log) and event_id = Log.default_options[:event_id]
-			payload.merge!(:event_hash => event_id)
-		end
-
-		attrs = { :topic => topic, :payload => payload }
-		if blk # this message should be replied
-			attrs.merge!(:has_reply => true)
-			@callback = blk
-		end
-		@message = attrs
-	end
-
-	class MessageError < RuntimeError; end
-
-	def flush
-		out = ''
-		IO.popen("#{File.dirname(__FILE__)}/../speaker/speak 2>/dev/null", 'w+') do |io|
-			io.puts @message.to_json
-			out = io.read
-		end
-		begin
-			response = JSON.parse(out)
-			response.delete('event_hash')
-			@callback.call(response) if @callback
-		rescue JSON::ParserError
-			if out.include?('Timeout::Error')
-				raise Timeout::Error, "Timed out while waiting for a response for #{@message[:topic]}"
-			else
-				raise MessageError, out
-			end
-		end
-	end
-end

data/speaker/speak

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-	$:.unshift '/usr/local/droid/lib'
-	require 'heroku_droid'
-
-	msg = JSON.load(gets)
-
-	Timeout.timeout(10) do
-		HerokuDroid.new('Droid Speaker', :standard_topics => false) do |droid|
-			if msg['has_reply']
-				@event_hash = msg['payload']['event_hash'] ||= Droid::Basic.new(droid).event_hash
-				droid.listen4('event.error') do |d|
-					if d.headers[:event_hash] == @event_hash
-						puts "Message #{msg['topic']} failed: see event #{@event_hash}"
-						Droid.stop_safe
-					end
-				end
-
-				droid.publish(msg['topic'], msg['payload']) do |d|
-					puts d.params.to_json
-					Droid.stop_safe
-				end
-			else
-				droid.publish(msg['topic'], msg['payload'])
-				puts({}.to_json)
-				Droid.stop_safe
-			end
-		end
-	end
-rescue Object => e
-	puts "#{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
-end

data/speaker/test.rb

@@ -1,58 +0,0 @@
-Thread.new do
-	require File.dirname(__FILE__) + '/../lib/heroku_droid'
-	HerokuDroid.new('Droid speaker test') do |droid|
-		droid.listen4('speaker.test') do |msg|
-			if msg['marco'] == 1
-				puts "Got 'marco', returning 'polo'..."
-				msg.reply('polo' => 1)
-			else
-				puts "Bad payload"
-				msg.reply('error' => 1)
-			end
-		end
-		droid.listen4('speaker.raise') do |msg|
-			raise "droid raised exception"
-		end
-	end
-end
-
-sleep 2
-
-require File.dirname(__FILE__) + '/droid_speaker'
-
-puts "\nTest 1: Sending simple message"
-DroidSpeaker.send('fire.and.forget', 'val' => 1)
-puts "\tSuccess!"
-
-puts "\nTest 2: Sending and receiving response"
-DroidSpeaker.send('speaker.test', 'marco' => 1) do |r|
-	if r['polo'] == 1
-		puts "\tSuccess!"
-	else
-		puts "\tFailed, result: #{r.inspect}"
-	end
-end
-
-puts "\nTest 3: Exceptions"
-begin
-	DroidSpeaker.send('speaker.raise', {}) do |r|
-		puts "\tFailed, expected exception"
-	end
-rescue DroidSpeaker::MessageError => e
-	if e.message =~ /event \w+/
-		puts "\tSuccess!"
-	else
-		puts "\tFailed, droid speaker raised #{e.message}"
-	end
-end
-
-puts "\nTest 4: Timeout"
-begin
-	DroidSpeaker.send('dont.reply', {}) do |r|
-		puts "\tFailed, didnt expect a response"
-	end
-rescue Timeout::Error
-	puts "\tSuccess!"
-rescue Exception => e
-	puts "\tFailed, expected Timeout::Error, got #{e.class.name}"
-end