logglier 0.2.7 → 0.2.8

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

@@ -35,6 +35,8 @@ module Logglier
           @headers = {}
           if @format == :json
             @headers['Content-Type'] = 'application/json'
+          else
+            @headers['Content-Type'] = 'text/plain'
           end
 
           connect!

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

@@ -4,7 +4,34 @@ module Logglier
   module Client
     class HTTP
 
-      # Used by the Threaded client to hold a queue, deliver messsages from it
+      # Used by the Threaded client to manage the delivery thread
+      # recreating it if is lost due to a fork.
+      #
+      class DeliveryThreadManager
+        def initialize(input_uri, opts={})
+          @input_uri, @opts = input_uri, opts
+          start_thread
+        end
+
+        # Pushes a message to the delivery thread, starting one if necessary
+        def deliver(message)
+          start_thread unless @thread.alive?
+          @thread.deliver(message)
+          #Race condition? Sometimes we need to rescue this and start a new thread
+        rescue NoMethodError
+          @thread.kill #Try not to leak threads, should already be dead anyway
+          start_thread
+          retry
+        end
+
+        private
+
+        def start_thread
+          @thread = DeliveryThread.new(@input_uri, @opts)
+        end
+      end
+
+      # Used by the DeliveryThreadManager to hold a queue, deliver messsages from it
       # and to ensure it's flushed on program exit.
       #
       # @note Uses NetHTTPProxy
@@ -19,7 +46,6 @@ module Logglier
         # @note See NetHTTPProxy for further option processing of opts
         # @note registers an at_exit handler that signals exit intent and joins the thread.
         def initialize(input_uri, opts={})
-
           @input_uri = input_uri
 
           opts[:read_timeout] = opts[:read_timeout] || 120

data/lib/logglier/client/http.rb

@@ -14,7 +14,7 @@ module Logglier
         setup_input_uri(opts)
         @format = opts[:format] ? opts[:format].to_sym : nil
         @deliverer = if opts[:threaded]
-          Logglier::Client::HTTP::DeliveryThread.new(@input_uri, opts)
+          Logglier::Client::HTTP::DeliveryThreadManager.new(@input_uri, opts)
         else
           Logglier::Client::HTTP::NetHTTPProxy.new(@input_uri, opts)
         end

data/lib/logglier/client/syslog.rb

@@ -60,7 +60,7 @@ module Logglier
       # Syslog specific PRI calculation.
       # See RFC3164 4.1.1
       def pri(severity)
-        @facility + case severity
+        severity_value = case severity
         when "FATAL"
           0
         when "ERROR"
@@ -72,6 +72,7 @@ module Logglier
         when "DEBUG"
           7
         end
+        (@facility << 3) + severity_value
       end
 
       # Generate a syslog compat message

data/lib/logglier/client.rb

@@ -14,7 +14,7 @@ module Logglier
     # @return [Logglier::Client::HTTP, Logglier::Client::Syslog] returns an instance of the Logglier Client class 
     def self.new(input_url, opts={})
       unless input_url
-        raise URLRequired.new
+        raise InputURLRequired.new
       end
 
       opts.merge!({ :input_url => input_url })
@@ -90,7 +90,7 @@ module Logglier
         begin
           @input_uri = URI.parse(@input_uri)
         rescue URI::InvalidURIError => e
-          raise URLRequired.new("Invalid Input URL: #{@input_uri}")
+          raise InputURLRequired.new("Invalid Input URL: #{@input_uri}")
         end
       end
 

data/lib/logglier/version.rb

@@ -1,3 +1,3 @@
 module Logglier
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/logglier.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.5.0'
+  s.add_development_dependency 'rspec', '~> 2.11.0'
 end
 
 

data/spec/client/syslog_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Logglier::Client::Syslog do
+  describe "PRI calculation conforms to RFC3164 4.1.1" do
+    before do
+      UDPSocket.stub(:new).and_return(mock("socket").as_null_object)
+      TCPSocket.stub(:new).and_return(mock("Socket").as_null_object)
+    end
+    it "calculates a number with the lowest 3 bits representing the severity and the higher bits representing the facility" do
+      client = described_class.new(:input_url => "udp://127.0.0.1:514/17")
+      client.pri("WARN").should == (17 << 3) + 4
+    end
+  end
+end

data/spec/http_spec.rb

@@ -23,6 +23,11 @@ describe 'HTTP' do
     proxy.failsafe.should == $stderr
   end
 
+  it "defaults Content-Type header to text/plain" do
+    @http.should_receive(:request_post).with(anything(), anything(), hash_including('Content-Type' => 'text/plain'))
+    @proxy.deliver('message')
+  end
+
   describe "error handling" do
     Logglier::Client::HTTP::NetHTTPProxy::RETRY_EXCEPTIONS.each do |error|
       context "for #{error}" do

data/spec/threaded_spec.rb

@@ -19,3 +19,43 @@ describe Logglier::Client::HTTP::DeliveryThread do
     subject.join
   end
 end
+
+describe Logglier::Client::HTTP::DeliveryThreadManager do
+  before do
+    @mock_http = MockNetHTTPProxy.new
+    Logglier::Client::HTTP::NetHTTPProxy.stub(:new) { @mock_http }
+  end
+
+  subject { described_class.new(URI.parse('http://localhost')) }
+
+  it "should instantiate a delivery_thread" do
+    Logglier::Client::HTTP::DeliveryThread.should_receive(:new).once
+    subject
+  end
+
+  it "should deliver messages via delivery_thread" do
+    @mock_thread = Object.new
+    @mock_thread.stub(:alive?) { true }
+    @mock_thread.should_receive(:deliver).once.with('foo')
+    Logglier::Client::HTTP::DeliveryThread.should_receive(:new).once.and_return(@mock_thread)
+
+    subject.deliver('foo')
+  end
+
+  it "should respawn a dead delivery_thread" do
+    @first_thread = subject.instance_variable_get(:@thread)
+    @first_thread.should_receive(:deliver).once.with('first')
+
+    subject.deliver('first')
+
+    @first_thread.kill
+
+    subject.deliver('force respawn')
+
+    @second_thread = subject.instance_variable_get(:@thread)
+    @second_thread.should_not eql(@first_thread)
+    @second_thread.should_receive(:deliver).once.with('second')
+
+    subject.deliver('second')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logglier
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301258989680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301258989680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301258989120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70301258989120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 description: Logger => Loggly
 email: edwardam@interlix.com
 executables: []
@@ -51,6 +61,7 @@ files:
 - ./lib/logglier/client.rb
 - ./lib/logglier/version.rb
 - ./lib/logglier.rb
+- ./spec/client/syslog_spec.rb
 - ./spec/client_spec.rb
 - ./spec/http_spec.rb
 - ./spec/logglier_spec.rb
@@ -76,13 +87,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: logglier
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Loggly "plugin" for Logger
 test_files:
+- ./spec/client/syslog_spec.rb
 - ./spec/client_spec.rb
 - ./spec/http_spec.rb
 - ./spec/logglier_spec.rb
 - ./spec/spec_helper.rb
 - ./spec/threaded_spec.rb
+has_rdoc: