logglier 0.2.5 → 0.2.6

data/lib/logglier/client.rb

@@ -16,7 +16,7 @@ module Logglier
       unless input_url
         raise URLRequired.new
       end
-      
+
       opts.merge!({ :input_url => input_url })
 
       begin
@@ -33,7 +33,7 @@ module Logglier
       else
         raise Logglier::UnsupportedScheme.new("#{input_uri.scheme} is unsupported")
       end
-      
+
     end
 
     module InstanceMethods

data/lib/logglier/client/http/sync.rb

@@ -7,18 +7,35 @@ module Logglier
       # Used to wrap and setup Net::HTTP as we need it
       class NetHTTPProxy
 
+        RETRY_EXCEPTIONS = [
+          TimeoutError, OpenSSL::SSL::SSLError, Errno::EPIPE,
+          EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT,
+          Errno::ECONNREFUSED
+        ]
+
+        RETRIES = 3
+
+        attr_accessor :failsafe
+
         # @param [URI] input_uri URI to deliver messages to
         # @param [Hash] opts Option hash
         # @option [Integer] read_timeout Read timeout for the http session. defaults to 2
         # @option [Integer] open_timeout Open timeout for the http session. defaults to 2
         # @option [Integer] verify_mode OpenSSL::SSL::VERIFY_* constant
         # @option [String] ca_file Path to the ca file
+        # @option [IO] failsafe Where to `#puts` delivery errors. defaults to `$stderr`
         def initialize(input_uri, opts={})
           @input_uri = input_uri
           @verify_mode = opts[:verify_mode] || OpenSSL::SSL::VERIFY_PEER
           @ca_file = opts[:ca_file]
           @read_timeout = opts[:read_timeout] || 5
           @open_timeout = opts[:open_timeout] || 5
+          @failsafe = opts[:failsafe] || $stderr
+          @format = opts[:format] ? opts[:format].to_sym : nil
+          @headers = {}
+          if @format == :json
+            @headers['Content-Type'] = 'application/json'
+          end
 
           connect!
         end
@@ -27,21 +44,22 @@ module Logglier
         #
         # @param [String] message The message to deliver
         def deliver(message)
-          retried = false
+          retries = 0
+
           begin
-            @http.request_post(@input_uri.path, message)
-          # We're using persistent connections, so connection can be closed by the other side
-          # after a timeout. Don't consider it an error, just retry once.
-          rescue Errno::ECONNRESET
-            unless retried
-              retried = true
+            @http.request_post(@input_uri.path, message, @headers)
+          rescue *RETRY_EXCEPTIONS => e
+            if retries < RETRIES
+              retries += 1
+              failsafe_retrying(e, message, retries)
+              sleep retries
               connect!
               retry
             else
-              $stderr.puts "WARNING: connection was reset while posting message: #{message}"
+              failsafe_errored(e, message)
             end
-          rescue TimeoutError, OpenSSL::SSL::SSLError, EOFError, Errno::ECONNRESET => e
-            $stderr.puts "WARNING: #{e.class} posting message: #{message}"
+          rescue Exception => e
+            failsafe_errored(e, message)
           end
         end
 
@@ -64,6 +82,18 @@ module Logglier
           @http.open_timeout = @open_timeout
 
         end
+
+        def failsafe_retrying(exception, message, retries)
+          @failsafe.puts "WARNING: [#{retries}/#{RETRIES}] " + failsafe_message(exception, message)
+        end
+
+        def failsafe_errored(exception, message)
+          @failsafe.puts "ERROR: " + failsafe_message(exception, message)
+        end
+
+        def failsafe_message(exception, message)
+          "caught `#{exception.class}: #{exception.message}` while attempting to deliver: #{message}"
+        end
       end
 
     end

data/lib/logglier/version.rb

@@ -1,3 +1,3 @@
 module Logglier
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/http_spec.rb

@@ -7,7 +7,9 @@ describe 'HTTP' do
     @http.stub!(:read_timeout=)
     @http.stub!(:open_timeout=)
     Net::HTTP.stub!(:new).and_return(@http)
-    @proxy = Logglier::Client::HTTP::NetHTTPProxy.new(URI.parse('http://localhost:9292'))
+    @failsafe = StringIO.new
+    @proxy = Logglier::Client::HTTP::NetHTTPProxy.new(URI.parse('http://localhost:9292'), :failsafe => @failsafe)
+    @proxy.stub(:sleep)
   end
 
   it "retries after connection is reset" do
@@ -16,14 +18,69 @@ describe 'HTTP' do
     @proxy.deliver('message')
   end
 
-  it "retries only once connection is reset" do
-    @http.should_receive(:request_post).exactly(2).times.and_raise Errno::ECONNRESET
-    @proxy.deliver('message')
+  it "defaults its failsafe to $stderr" do
+    proxy = Logglier::Client::HTTP::NetHTTPProxy.new(URI.parse('http://localhost:9292'))
+    proxy.failsafe.should == $stderr
   end
 
-  it "fails for other errors" do
-    @http.should_receive(:request_post).once.and_raise EOFError
-    @proxy.deliver('message')
+  describe "error handling" do
+    Logglier::Client::HTTP::NetHTTPProxy::RETRY_EXCEPTIONS.each do |error|
+      context "for #{error}" do
+        context "with total failure" do
+          before do
+            @http.should_receive(:request_post).exactly(4).times.and_raise error
+          end
+
+          it "retries 3 times then fails" do
+            @proxy.deliver('message')
+          end
+
+          it "logs messages to the failsafe along the way" do
+            @proxy.deliver('message')
+
+            @failsafe.rewind
+            lines = @failsafe.readlines
+            lines.size.should == 4
+            lines[0..2].each {|l| l.should =~ /^WARNING/ }
+            lines.last.should =~ /^ERROR/
+          end
+        end
+
+        context "if things start working again" do
+          before do
+            @http.should_receive(:request_post).exactly(3).times.and_raise error
+            @http.should_receive(:request_post)
+          end
+
+          it "is successful if things start working again" do
+            @proxy.deliver('message')
+          end
+
+          it "logs messages to the failsafe along the way" do
+            @proxy.deliver('message')
+
+            @failsafe.rewind
+            lines = @failsafe.readlines
+            lines.size.should == 3
+            lines[0..2].each {|l| l.should =~ /^WARNING/ }
+          end
+        end
+      end
+    end
+
+    context "for an unknown error" do
+      it "logs a message" do
+        error = Class.new(StandardError)
+
+        @http.should_receive(:request_post).and_raise error
+        @proxy.deliver('message')
+
+        @failsafe.rewind
+        lines = @failsafe.readlines
+        lines.size.should == 1
+        lines.first.should =~ /^ERROR/
+      end
+    end
   end
 
   describe "json format" do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 require 'logglier'
+require 'stringio'
 
 module LoggerHacks
   def logdev

metadata

@@ -1,62 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: logglier
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Edward Muller (aka freeformz)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70175089585180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70175089585180
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70175093319600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70175093319600
 description: Logger => Loggly
 email: edwardam@interlix.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Gemfile
 - LICENSE
@@ -74,45 +56,31 @@ files:
 - ./spec/logglier_spec.rb
 - ./spec/spec_helper.rb
 - ./spec/threaded_spec.rb
-has_rdoc: true
 homepage: http://github.com/freeformz/logglier
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: logglier
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Loggly "plugin" for Logger
-test_files: 
+test_files:
 - ./spec/client_spec.rb
 - ./spec/http_spec.rb
 - ./spec/logglier_spec.rb