logglier 0.1.0 → 0.1.1

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

@@ -6,29 +6,19 @@ module Logglier
 
       class Sync
         include Logglier::Client::InstanceMethods
+        include Logglier::Client::HTTP::InstanceMethods
 
         attr_reader :input_uri, :http
 
         def initialize(opts={})
           setup_input_uri(opts)
 
-          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
-          if @input_uri.scheme == 'https'
-            @http.use_ssl = true
-            @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-
-          @http.read_timeout = opts[:read_timeout] || 2
-          @http.open_timeout = opts[:open_timeout] || 2
+          setup_http(opts)
         end
 
         # Required by Logger::LogDevice
         def write(message)
-          begin
-            @http.request_post(@input_uri.path, message)
-          rescue TimeoutError => e
-            $stderr.puts "WARNING: TimeoutError posting message: #{message}"
-          end
+          deliver(message)
         end
 
         # Required by Logger::LogDevice

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

@@ -11,6 +11,7 @@ module Logglier
       #
       # Not meant to be used directly.
       class DeliveryThread < Thread
+        include Logglier::Client::HTTP::InstanceMethods
 
         # @param [URI] input_uri The uri to deliver messags to
         # @param [Integer] read_timeout Read timeout for the http session. defaults to 120
@@ -21,21 +22,16 @@ module Logglier
 
           @input_uri = input_uri
 
-          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
-          if @input_uri.scheme == 'https'
-            @http.use_ssl = true
-            @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-
-          @http.read_timeout = read_timeout
-          @http.open_timeout = open_timeout
+          setup_http( {:read_timeout => read_timeout, :open_timeout => open_timeout} )
 
           @queue = Queue.new
           @exiting = false
 
           super do
-            until @exiting && @queue.empty?
-              deliver(@queue.pop)
+            loop do
+              msg = @queue.pop
+              break if msg == :__delivery_thread_exit_signal__
+              deliver(msg)
             end
           end
 
@@ -48,18 +44,7 @@ module Logglier
         # Signals the queue that we're exiting
         def exit!
           @exiting = true
-          @queue.push(:__delivery_thread_exit_signal__)
-        end
-
-        # Delivers individual messages via http
-        def deliver(message)
-          unless message == :__delivery_thread_exit_signal__
-            begin
-              @http.request_post(@input_uri.path, message)
-            rescue TimeoutError => e
-              $stderr.puts "WARNING: TimeoutError posting message: #{message}"
-            end
-          end
+          @queue.push :__delivery_thread_exit_signal__
         end
 
         # Pushes a message onto the internal queue

data/lib/logglier/client/http.rb

@@ -13,6 +13,37 @@ module Logglier
         end
       end
 
+      module InstanceMethods
+
+        # Sets up @http 
+        #
+        # @param [Hash] opts The options Hash
+        # @option opts [String] :read_timeout The read timeout for the http connection
+        # @option opts [String] :open_timeout The open timeout for the http connection
+        def setup_http(opts={})
+          @http = Net::HTTP.new(@input_uri.host, @input_uri.port)
+          if @input_uri.scheme == 'https'
+            @http.use_ssl = true
+            @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
+          @http.read_timeout = opts[:read_timeout] || 2
+          @http.open_timeout = opts[:open_timeout] || 2
+        end
+
+        # Delivers the message via HTTP, handling errors
+        #
+        # @param [String] message The message to deliver
+        def deliver(message)
+          begin
+            @http.request_post(@input_uri.path, message)
+          rescue TimeoutError, OpenSSL::SSL::SSLError, EOFError, Errno::ECONNRESET => e
+            $stderr.puts "WARNING: #{e.class} posting message: #{message}"
+          end
+        end
+
+      end
+
     end
   end
 end

data/lib/logglier/version.rb

@@ -1,3 +1,3 @@
 module Logglier
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/logglier.gemspec

@@ -12,7 +12,7 @@ EOD
 
   s.authors           = ["Edward Muller (aka freeformz)"]
   s.email             = "edwardam@interlix.com"
-  s.homepage          = "http://icanhazdowntime.org"
+  s.homepage          = "http://github.com/freeformz/logglier"
 
   s.files             = %w{ README.md Gemfile LICENSE logglier.gemspec Rakefile } + Dir["#{dir}/lib/**/*.rb"]
   s.require_paths     = ["lib"]

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logglier
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.1.0
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Edward Muller (aka freeformz)
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -07:00
+date: 2011-05-11 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
@@ -63,7 +76,7 @@ files:
 - ./spec/spec_helper.rb
 - ./spec/threaded_spec.rb
 has_rdoc: true
-homepage: http://icanhazdowntime.org
+homepage: http://github.com/freeformz/logglier
 licenses: []
 
 post_install_message: 
@@ -76,17 +89,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: logglier
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Loggly 'plugin' for Logger