logasm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc85c64499598712bb88fae7042b01cb73c2f43f
-  data.tar.gz: a31ac1cb0489c75c740d52316a72e968672d83b4
+  metadata.gz: b3101253198b60ee5b25bb1630c9e921adb38aeb
+  data.tar.gz: 6bd9c7299915e79a8e66e435203814055d02975e
 SHA512:
-  metadata.gz: 99904786ff29d235df18e6a3752b55c450893ccb07a27d3add9045752fb4694c9ded0eb4f12c324a697daff0f805e1ff50b77c124158226ec5cacd3574350e0f
-  data.tar.gz: 8fbfe86ee157deb8f2da0b4e1fd8ca352c9e6de499d3ca915a5b763ca2b8ba704bf2935aa68ee19a8dd39c2626fe314c72a7a133b33f8de0d99892d48c13ec15
+  metadata.gz: d79512c5dfae753ff1b23afa09d847b4eea76d2c659b496f4b45d1646113af73683c808cb7a756c472dd8eb3befbcf4e2532847180d42512adb9eb8b42db475d
+  data.tar.gz: 85187d7037e0df502f3c25e2c792d1769a4583f39d3876534069365eacea671b092dcb56f37f30216dc89c47a4d6a774223a55ec651f36124124b69efdffc177

data/Gemfile.lock

@@ -1,26 +1,15 @@
 PATH
   remote: .
   specs:
-    logasm (0.2.0)
+    logasm (0.2.1)
       inflecto
       logstash-event (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (2.0.0)
-    atomic (1.1.99)
-    bunny (1.6.3)
-      amq-protocol (>= 1.9.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    freddy (0.4.1)
-      bunny (= 1.6.3)
-      hamster (~> 1.0.1.pre.rc3)
-      symbolizer
-      thread (~> 0.2)
-    hamster (1.0.1.pre.rc3)
-      atomic (~> 1.1)
     inflecto (0.0.2)
     logstash-event (1.2.02)
     method_source (0.8.2)
@@ -43,15 +32,12 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     slop (3.6.0)
-    symbolizer (0.0.1)
-    thread (0.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  freddy (~> 0.4.1)
   logasm!
   pry
   rake

data/lib/logasm/adapters/rabbitmq_adapter.rb

@@ -12,7 +12,7 @@ require_relative 'rabbitmq_adapter/message_builder'
 class Logasm
   module Adapters
     class RabbitmqAdapter
-      attr_reader :publisher
+      attr_reader :freddy
 
       CONFIGURATION_KEYS = [:host, :user, :pass, :port]
 
@@ -21,15 +21,14 @@ class Logasm
         logger = Logger.new(STDOUT)
         @queue = arguments.fetch(:queue, 'logstash-queue')
         @level = level
-
         @message_builder = MessageBuilder.new(service)
-        @freddy = Freddy.build(logger, config)
+        @freddy = Freddy.build(logger, config.merge({recover_from_connection_close: true}))
       end
 
       def log(level, metadata = {})
         if meets_threshold?(level)
           message = @message_builder.build_message metadata, level
-          @freddy.deliver @queue, metadata
+          deliver_message message
         end
       end
 
@@ -38,6 +37,11 @@ class Logasm
       def meets_threshold?(level)
         LOG_LEVELS.index(level.to_s) >= @level
       end
+
+      def deliver_message(message)
+        @freddy.deliver @queue, message
+      rescue Bunny::ConnectionClosedError
+      end
     end
   end
 end

data/logasm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "logasm"
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.1'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}

data/spec/adapters/rabbitmq_adapter_spec.rb

@@ -2,37 +2,31 @@ require 'spec_helper'
 require_relative '../../lib/logasm/adapters/rabbitmq_adapter'
 
 describe Logasm::Adapters::RabbitmqAdapter do
-  let(:publisher) { adapter.publisher }
-
-  before do
-    Logasm::Adapters::RabbitmqAdapter::Publisher.any_instance.stub(:initialize).and_return(double)
-  end
+  let(:adapter) { described_class.new(log_level, nil, { host: 'localhost',
+                                                user: 'guest',
+                                                pass: 'guest',
+                                                port: '5672' }
+                                      ) }
+  let(:freddy) { adapter.freddy }
 
   describe '#log' do
     context 'when logging a message' do
-      let(:adapter) { described_class.new(0, nil, { host: 'localhost',
-                                                    user: 'guest',
-                                                    pass: 'guest',
-                                                    port: '5672' }
-                                          ) }
+      let(:log_level) { 0 }
 
-      it 'delegates to publisher' do
-        expect(publisher).to receive(:publish)
+      it 'delegates to freddy' do
+        expect(freddy).to receive(:deliver)
 
         adapter.log :info, message: 'test'
       end
     end
 
     context 'when log level is lower than threshold' do
-      let(:adapter) { described_class.new(3, nil, { host: 'localhost',
-                                                    user: 'guest',
-                                                    pass: 'guest',
-                                                    port: '5672' }
-                                          ) }
+      let(:log_level) { 3 }
 
       it 'does not delegate to freddy' do
-        expect(publisher).not_to receive(:publish)
-        adapter.log :info, message: 'test'
+        expect(freddy).not_to receive(:deliver)
+
+        adapter.log :info, message: 'test', a: 'b'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -101,7 +101,6 @@ files:
 - lib/logasm/adapters/logstash_adapter/formatter.rb
 - lib/logasm/adapters/rabbitmq_adapter.rb
 - lib/logasm/adapters/rabbitmq_adapter/message_builder.rb
-- lib/logasm/adapters/rabbitmq_adapter/publisher.rb
 - lib/logasm/adapters/stdout_adapter.rb
 - logasm.gemspec
 - spec/adapters/logstash_adapter/formatter_spec.rb

data/lib/logasm/adapters/rabbitmq_adapter/publisher.rb

@@ -1,20 +0,0 @@
-require 'bunny'
-
-class Logasm
-  module Adapters
-    class RabbitmqAdapter
-      class Publisher
-        def initialize(queue, config)
-          connection = Bunny.new("amqp://#{config[:user]}:#{config[:pass]}@#{config[:host]}:#{config[:port]}")
-          connection.start
-          @exchange = connection.create_channel.default_exchange
-          @queue = queue
-        end
-
-        def publish(message)
-          @exchange.publish(message.to_json, :routing_key => @queue)
-        end
-      end
-    end
-  end
-end