logasm 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687158e874206e3955b57df05548074eec12ce28
-  data.tar.gz: 66ac91d1af8c3ecce4c2b8314b505d1578d6ec5f
+  metadata.gz: a9ade685a2af887a257340ed2dab29d09abceb8a
+  data.tar.gz: 1b5671acbe54ce055156a496a481ce524270a3b1
 SHA512:
-  metadata.gz: 7534c016b81f0716725577489ba398b870dcb792049872268838600700ff817416b6a88ed0045575bff55f3f083d4c432a6849eb31f48e24a44a17d27d0c47bc
-  data.tar.gz: b338dd4d8133b1f9cf18eaf4da39952b2346003c8299b9fc00c47978f497def27e4dddfcecdf69ecd7a1bb5c2bf0c628176f43b34d4621ab717a961aaf5f7382
+  metadata.gz: d5a206ab30b603af225468e52195c9ef3e87b42d2bf71cd7794ebe98b3eabe952fe9df666d1a1618915a379e7ac0559fba7e5543d6dbf5d1de1574157fb3ce83
+  data.tar.gz: b363d87991efde13a6ea82b82e673536aa83179ad1f103f1d8098fe00222bf2b9e321b5a9bc59cf3ce0b9fbf451ec53eeb11c5ebfd8b3f11c21265d9a363d88e

data/lib/logasm/adapters/rabbitmq_adapter.rb

@@ -1,8 +1,8 @@
 begin
-  require 'freddy'
+  require 'bunny'
 rescue LoadError => e
-  raise unless e.message =~ /freddy/
-  exception = e.exception('To use RabbitMQ adapter for logging, please install freddy!')
+  raise unless e.message =~ /bunny/
+  exception = e.exception('To use RabbitMQ adapter for logging, please install bunny!')
   exception.set_backtrace(e.backtrace)
   raise exception
 end
@@ -10,17 +10,16 @@ end
 class Logasm
   module Adapters
     class RabbitmqAdapter
-      attr_reader :freddy
-
       CONFIGURATION_KEYS = [:host, :hosts, :user, :pass, :port]
 
+      attr_reader :bunny
+
       def initialize(level, service_name, arguments = {})
         config = arguments.select { |key, value| CONFIGURATION_KEYS.include?(key) }
-        logger = NullLogger.new
-        @queue = arguments.fetch(:queue, 'logstash-queue')
         @level = level
         @service_name = service_name
-        @freddy = Freddy.build(logger, config.merge({recover_from_connection_close: true}))
+        @bunny = Bunny.new(config)
+        @queue_name = arguments.fetch(:queue, 'logstash-queue')
       end
 
       def log(level, metadata = {})
@@ -57,9 +56,20 @@ class Logasm
       end
 
       def deliver_message(message)
-        @freddy.deliver @queue, message
+        exchange.publish(JSON.dump(message), {
+          content_type: 'application/json',
+          routing_key: @queue_name
+        })
       rescue Bunny::ConnectionClosedError
       end
+
+      def exchange
+        @exchange ||= begin
+          bunny.start
+          channel = bunny.create_channel
+          channel.default_exchange
+        end
+      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.5.0'
+  gem.version       = '0.5.2'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}
@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler", "~> 1.3"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "freddy", "~> 0.4.1"
+  gem.add_development_dependency "bunny"
 end

data/spec/adapters/rabbitmq_adapter_spec.rb

@@ -7,10 +7,12 @@ describe Logasm::Adapters::RabbitmqAdapter do
       host: 'localhost', user: 'guest', pass: 'guest', port: '5672'
     })
   end
-  let(:freddy) { adapter.freddy }
+  let(:bunny) { double(start: nil, create_channel: channel) }
+  let(:channel) { double(default_exchange: exchange) }
+  let(:exchange) { spy }
 
   before do
-    allow(Freddy).to receive(:build) { FreddyMock.new }
+    allow(Bunny).to receive(:new) { bunny }
   end
 
   describe '#log' do
@@ -20,15 +22,10 @@ describe Logasm::Adapters::RabbitmqAdapter do
       it 'delegates to freddy' do
         adapter.log :info, message: 'test'
 
-        expect(freddy.deliveries.size).to eq(1)
-
-        queue, event = freddy.deliveries[0]
-        expect(queue).to eq('logstash-queue')
-        expect(event[:message]).to eq('test')
-        expect(event[:application]).to eq('test_service')
-        expect(event[:level]).to eq('info')
-        expect(event[:host]).to be_a(String)
-        expect(event[:@timestamp]).to match(/\d{4}-\d{2}-\d{2}T.*/)
+        expect(exchange).to have_received(:publish).with(
+          match(/{"@timestamp":"\d{4}-\d{2}-\d{2}T.*","host":"\w+","message":"test","application":"test_service","level":"info"}/),
+          { content_type: 'application/json', routing_key: 'logstash-queue' }
+        )
       end
     end
 
@@ -36,9 +33,9 @@ describe Logasm::Adapters::RabbitmqAdapter do
       let(:log_level) { 3 }
 
       it 'does not delegate to freddy' do
-        expect(freddy).not_to receive(:deliver)
-
         adapter.log :info, message: 'test', a: 'b'
+
+        expect(exchange).to_not have_received(:publish)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: freddy
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 description: It's logasmic
 email:
 - support@salemove.com
@@ -100,7 +100,6 @@ files:
 - spec/preprocessors/blacklist_spec.rb
 - spec/preprocessors/whitelist_spec.rb
 - spec/spec_helper.rb
-- spec/support/freddy_mock.rb
 - spec/support/implement_interface.rb
 - spec/utils_spec.rb
 homepage: 
@@ -136,6 +135,5 @@ test_files:
 - spec/preprocessors/blacklist_spec.rb
 - spec/preprocessors/whitelist_spec.rb
 - spec/spec_helper.rb
-- spec/support/freddy_mock.rb
 - spec/support/implement_interface.rb
 - spec/utils_spec.rb

data/spec/support/freddy_mock.rb

@@ -1,11 +0,0 @@
-class FreddyMock
-  attr_reader :deliveries
-
-  def initialize
-    @deliveries = []
-  end
-
-  def deliver(queue, params)
-    @deliveries << [queue, params]
-  end
-end