logplex 0.0.1.pre.2 → 0.0.1.pre.3

data/README.md

@@ -41,9 +41,10 @@ You can configure default values for logplex message posting:
 
 ```ruby
 Logplex.configure do |config|
-  config.logplex_url = 'https://logplex.example.com'
-  config.process     = 'stats'
-  config.host        = 'host'
+  config.logplex_url     = 'https://logplex.example.com'
+  config.process         = 'stats'
+  config.host            = 'host'
+  config.publish_timeout = 2
 end
 ```
 

data/lib/logplex/configuration.rb

@@ -1,12 +1,14 @@
 module Logplex
   class Configuration
     attr_accessor :logplex_url,
-      :process,
-      :host
+                  :process,
+                  :host,
+                  :publish_timeout
 
     def initialize
-      @logplex_url = 'https://east.logplex.io'
-      @host        = 'localhost'
+      @logplex_url     = 'https://east.logplex.io'
+      @host            = 'localhost'
+      @publish_timeout = 1
     end
   end
 

data/lib/logplex/publisher.rb

@@ -2,9 +2,14 @@
 require 'base64'
 require 'restclient'
 require 'logplex/message'
+require 'timeout'
 
 module Logplex
   class Publisher
+    PUBLISH_ERRORS = [RestClient::InternalServerError,
+                      RestClient::Unauthorized,
+                      Timeout::Error].freeze
+
     def initialize(token, logplex_url=nil)
       @token       = token
       @logplex_url = logplex_url || Logplex.configuration.logplex_url
@@ -15,9 +20,14 @@ module Logplex
       messages.map! { |m| Message.new(m, opts.merge(token: @token)) }
       messages.each(&:validate)
       if messages.inject(true) { |accum, m| m.valid? }
-        api_post(
-          messages.map(&:syslog_frame).join('')
-        )
+        begin
+          Timeout::timeout(Logplex.configuration.publish_timeout) do
+            api_post(messages.map(&:syslog_frame).join(''))
+            true
+          end
+        rescue *PUBLISH_ERRORS
+          false
+        end
       end
     end
 

data/lib/logplex/version.rb

@@ -1,3 +1,3 @@
 module Logplex
-  VERSION = "0.0.1.pre.2"
+  VERSION = "0.0.1.pre.3"
 end

data/spec/logplex/publisher_spec.rb

@@ -5,42 +5,82 @@ require 'support/fake_logplex'
 
 describe Logplex::Publisher, '#publish' do
   before do
-    ShamRack.mount(FakeLogplex.new, 'logplex.example.com', 443)
-
     Logplex.configure do |config|
       config.process = "postgres"
       config.host = "host"
     end
   end
 
-  after do
-    ShamRack.unmount_all
-    FakeLogplex.clear!
-    restore_default_config
-  end
+  context 'with a working logplex' do
+    before do
+      ShamRack.mount(FakeLogplex.new, 'logplex.example.com', 443)
 
-  it 'encodes a message and publishes it' do
-    FakeLogplex.register_token('t.some-token')
+    end
 
-    message = 'I have a message for you'
-    publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
-    publisher.publish(message)
+    after do
+      ShamRack.unmount_all
+      FakeLogplex.clear!
+      restore_default_config
+    end
 
-    expect(FakeLogplex).to have_received_message(message)
-  end
+    it 'encodes a message and publishes it' do
+      FakeLogplex.register_token('t.some-token')
 
-  it 'sends many messages in one request when passed an array' do
-    FakeLogplex.register_token('t.some-token')
-    messages = ['I have a message for you', 'here is another', 'some final thoughts']
+      message = 'I have a message for you'
+      publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+      publisher.publish(message)
 
-    publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+      expect(FakeLogplex).to have_received_message(message)
+    end
 
-    publisher.publish(messages)
+    it 'sends many messages in one request when passed an array' do
+      FakeLogplex.register_token('t.some-token')
+      messages = ['I have a message for you', 'here is another', 'some final thoughts']
 
-    messages.each do |message|
-      expect(FakeLogplex).to have_received_message(message)
+      publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+
+      publisher.publish(messages)
+
+      messages.each do |message|
+        expect(FakeLogplex).to have_received_message(message)
+      end
+
+      expect(FakeLogplex.requests_received).to eq(1)
     end
 
-    expect(FakeLogplex.requests_received).to eq(1)
+    it 'returns true' do
+      FakeLogplex.register_token('t.some-token')
+
+      message = 'I have a message for you'
+      publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+      expect(publisher.publish(message)).to be_true
+    end
+
+    it "returns false when there's an auth error" do
+      message = 'I have a message for you'
+      publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+      expect(publisher.publish(message)).to be_false
+    end
+  end
+
+  context 'when the logplex service is acting up' do
+    before do
+      ShamRack.at('logplex.example.com', 443) do
+        [500, {}, []]
+      end
+    end
+
+    after { ShamRack.unmount_all }
+
+    it 'returns false' do
+      publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+      expect(publisher.publish('hi')).to be_false
+    end
+  end
+
+  it "handles timeouts" do
+    RestClient.stub(:post).and_raise Timeout::Error
+    publisher = Logplex::Publisher.new('t.some-token', 'https://logplex.example.com')
+    expect(publisher.publish('hi')).to be_false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logplex
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.2
+  version: 0.0.1.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: valcro
-  requirement: &70106294975600 !ruby/object:Gem::Requirement
+  requirement: &70108795420800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106294975600
+  version_requirements: *70108795420800
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70106294975040 !ruby/object:Gem::Requirement
+  requirement: &70108795449080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106294975040
+  version_requirements: *70108795449080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106294974360 !ruby/object:Gem::Requirement
+  requirement: &70108795448440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106294974360
+  version_requirements: *70108795448440
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70106294973520 !ruby/object:Gem::Requirement
+  requirement: &70108795447760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106294973520
+  version_requirements: *70108795447760
 description: Publish and Consume Logplex messages
 email:
 - harold.gimenez@gmail.com