instrumental_agent 0.8.1 → 0.8.2

data/lib/instrumental/agent.rb

@@ -3,6 +3,7 @@ require 'instrumental/version'
 require 'logger'
 require 'thread'
 require 'socket'
+require 'timeout'
 
 # Sets up a connection to the collector.
 #
@@ -12,8 +13,9 @@ module Instrumental
     BACKOFF = 2.0
     MAX_RECONNECT_DELAY = 15
     MAX_BUFFER = 5000
+    REPLY_TIMEOUT = 10
 
-    attr_accessor :host, :port, :synchronous
+    attr_accessor :host, :port, :synchronous, :queue
     attr_reader :connection, :enabled
 
     def self.logger=(l)
@@ -21,7 +23,7 @@ module Instrumental
     end
 
     def self.logger
-      if !@logger 
+      if !@logger
         @logger = Logger.new(STDERR)
         @logger.level = Logger::WARN
       end
@@ -240,14 +242,24 @@ module Instrumental
       end
     end
 
+    def send_with_reply_timeout(message)
+      @socket.puts message
+      Timeout.timeout(REPLY_TIMEOUT) do
+        response = @socket.gets
+        if response.to_s.chomp != "ok"
+          raise "Bad Response #{response.inspect} to #{message.inspect}"
+        end
+      end
+    end
+
     def connection_worker
       command_and_args = nil
       logger.info "connecting to collector"
       @socket = TCPSocket.new(host, port)
-      @failures = 0
       logger.info "connected to collector at #{host}:#{port}"
-      @socket.puts "hello version #{Instrumental::VERSION} test_mode #{@test_mode}"
-      @socket.puts "authenticate #{@api_key}"
+      send_with_reply_timeout "hello version #{Instrumental::VERSION} test_mode #{@test_mode}"
+      send_with_reply_timeout "authenticate #{@api_key}"
+      @failures = 0
       loop do
         command_and_args = @queue.pop
         test_connection
@@ -272,7 +284,7 @@ module Instrumental
       disconnect
       @failures += 1
       delay = [(@failures - 1) ** BACKOFF, MAX_RECONNECT_DELAY].min
-      logger.info "disconnected, reconnect in #{delay}..."
+      logger.error "disconnected, #{@failures} failures in a row, reconnect in #{delay}..."
       sleep delay
       retry
     ensure

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = "0.8.1"
+  VERSION = '0.8.2'
 end

data/spec/agent_spec.rb

@@ -225,15 +225,6 @@ describe Instrumental::Agent, "enabled" do
     end
   end
 
-  it "should automatically reconnect" do
-    wait
-    @server.disconnect_all
-    @agent.increment('reconnect_test', 1, 1234) # triggers reconnect
-    wait
-    @server.connect_count.should == 2
-    @server.commands.last.should == "increment reconnect_test 1 1234"
-  end
-
   it "should automatically reconnect when forked" do
     wait
     @agent.increment('fork_reconnect_test', 1, 2)
@@ -320,6 +311,50 @@ describe Instrumental::Agent, "enabled" do
   end
 end
 
+describe Instrumental::Agent, "connection problems" do
+  after do
+    @server.stop
+  end
+
+  it "should automatically reconnect on disconnect" do
+    @server = TestServer.new
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
+    wait
+    @server.disconnect_all
+    @agent.increment('reconnect_test', 1, 1234) # triggers reconnect
+    wait
+    @server.connect_count.should == 2
+    @server.commands.last.should == "increment reconnect_test 1 1234"
+  end
+
+  it "should buffer commands when server is down" do
+    @server = TestServer.new(:listen => false)
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
+    wait
+    @agent.increment('reconnect_test', 1, 1234)
+    wait
+    @agent.queue.pop(true).should == "increment reconnect_test 1 1234\n"
+  end
+
+  it "should buffer commands when server is not responsive" do
+    @server = TestServer.new(:response => false)
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
+    wait
+    @agent.increment('reconnect_test', 1, 1234)
+    wait
+    @agent.queue.pop(true).should == "increment reconnect_test 1 1234\n"
+  end
+
+  it "should buffer commands when authentication fails" do
+    @server = TestServer.new(:authenticate => false)
+    @agent = Instrumental::Agent.new('test_token', :collector => @server.host_and_port, :synchronous => false)
+    wait
+    @agent.increment('reconnect_test', 1, 1234)
+    wait
+    @agent.queue.pop(true).should == "increment reconnect_test 1 1234\n"
+  end
+end
+
 describe Instrumental::Agent, "enabled with sync option" do
   before do
     @server = TestServer.new

data/spec/test_server.rb

@@ -1,12 +1,19 @@
 class TestServer
   attr_accessor :host, :port, :connect_count, :commands
 
-  def initialize
+  def initialize(options={})
+    default_options = {
+      :listen => true,
+      :authenticate => true,
+      :response => true,
+    }
+    @options = default_options.merge(options)
+
     @connect_count = 0
     @connections = []
     @commands = []
     @host = 'localhost'
-    listen
+    listen if @options[:listen]
   end
 
   def listen
@@ -25,6 +32,15 @@ class TestServer
               command = socket.gets.strip
               # puts "got: #{command}"
               commands << command
+              if %w[hello authenticate].include?(command.split(' ')[0])
+                if @options[:response]
+                  if @options[:authenticate]
+                    socket.puts "ok"
+                  else
+                    socket.puts "gtfo"
+                  end
+                end
+              end
             end
           end
         end
@@ -50,7 +66,7 @@ class TestServer
   def stop
     @stopping = true
     disconnect_all
-    @server.close # FIXME: necessary?
+    @server.close if @server
   end
 
   def disconnect_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170253502220 !ruby/object:Gem::Requirement
+  requirement: &70348894926180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253502220
+  version_requirements: *70348894926180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170253499520 !ruby/object:Gem::Requirement
+  requirement: &70348894925360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70170253499520
+  version_requirements: *70348894925360
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70170253497560 !ruby/object:Gem::Requirement
+  requirement: &70348894924280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253497560
+  version_requirements: *70348894924280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70170253518380 !ruby/object:Gem::Requirement
+  requirement: &70348894923220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253518380
+  version_requirements: *70348894923220
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70170253513400 !ruby/object:Gem::Requirement
+  requirement: &70348894922240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253513400
+  version_requirements: *70348894922240
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70170253526840 !ruby/object:Gem::Requirement
+  requirement: &70348894921540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253526840
+  version_requirements: *70348894921540
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70170253541560 !ruby/object:Gem::Requirement
+  requirement: &70348894920760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170253541560
+  version_requirements: *70348894920760
 description: Track anything.
 email:
 - support@instrumentalapp.com
@@ -126,21 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2243868577827404388
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2243868577827404388
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Agent for reporting data to instrumentalapp.com