logglier 0.2.4 → 0.2.5

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

@@ -15,20 +15,12 @@ module Logglier
         # @option [String] ca_file Path to the ca file
         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
 
-          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
-
-          if @input_uri.scheme == 'https'
-            @http.use_ssl = true
-            @http.verify_mode = opts[:verify_mode] || OpenSSL::SSL::VERIFY_PEER
-            @http.ca_file = opts[:ca_file] if opts[:ca_file]
-          end
-
-          # We prefer persistent HTTP connections, so workaround http://redmine.ruby-lang.org/issues/4522
-          @http.start
-
-          @http.read_timeout = opts[:read_timeout] || 2
-          @http.open_timeout = opts[:open_timeout] || 2
+          connect!
         end
 
         # Delivers the message via HTTP, handling errors
@@ -43,6 +35,7 @@ module Logglier
           rescue Errno::ECONNRESET
             unless retried
               retried = true
+              connect!
               retry
             else
               $stderr.puts "WARNING: connection was reset while posting message: #{message}"
@@ -51,6 +44,26 @@ module Logglier
             $stderr.puts "WARNING: #{e.class} posting message: #{message}"
           end
         end
+
+        private
+
+        def connect!
+          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
+
+          if @input_uri.scheme == 'https'
+            @http.use_ssl = true
+            @http.verify_mode = @verify_mode
+            @http.ca_file = @ca_file
+          end
+
+          # We prefer persistent HTTP connections, so workaround http://redmine.ruby-lang.org/issues/4522
+          # This causes problems with 1.8.6, so don't do it there.
+          @http.start unless RUBY_VERSION == "1.8.6"
+
+          @http.read_timeout = @read_timeout
+          @http.open_timeout = @open_timeout
+
+        end
       end
 
     end

data/lib/logglier/version.rb

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

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logglier
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
-  version: 0.2.4
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Edward Muller (aka freeformz)
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id002
@@ -75,12 +88,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []