logasm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 200640bf85d51b2e5a0624792740b9a3b4282b32
-  data.tar.gz: f957214552bdbdb5a6b0875e6937156a593de3a7
+  metadata.gz: dc85c64499598712bb88fae7042b01cb73c2f43f
+  data.tar.gz: a31ac1cb0489c75c740d52316a72e968672d83b4
 SHA512:
-  metadata.gz: 7d22edc2348903f4893b2f79dc8c34a34279280468d5c0ae96b5e3a6204cf0ca6b270929e2d80c61e2abda5705a019ac131769339741968d326002e110ed852d
-  data.tar.gz: 6f48d7208176093532f4d6773ea5488803099bad11ceb0e750248a0d0fa2d9b35bbc67322b80112ed816f96951ee427bc6c586bc9cfcfdaacb78b0f250124eef
+  metadata.gz: 99904786ff29d235df18e6a3752b55c450893ccb07a27d3add9045752fb4694c9ded0eb4f12c324a697daff0f805e1ff50b77c124158226ec5cacd3574350e0f
+  data.tar.gz: 8fbfe86ee157deb8f2da0b4e1fd8ca352c9e6de499d3ca915a5b763ca2b8ba704bf2935aa68ee19a8dd39c2626fe314c72a7a133b33f8de0d99892d48c13ec15

data/Gemfile.lock

@@ -1,15 +1,26 @@
 PATH
   remote: .
   specs:
-    logasm (0.1.1)
+    logasm (0.2.0)
       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)
@@ -18,25 +29,29 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      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/logstash_adapter.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'logstash-event'
+require_relative 'logstash_adapter/formatter'
 
 class Logasm
   module Adapters

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

@@ -0,0 +1,22 @@
+require 'socket'
+
+class Logasm
+  module Adapters
+    class RabbitmqAdapter
+      class MessageBuilder
+        HOST = ::Socket.gethostname
+
+        def initialize(service_name)
+          @service_name = service_name
+        end
+
+        def build_message(metadata, level)
+          metadata.merge({ application: @service_name,
+                           level: level,
+                           host: HOST,
+                           :@timestamp => Time.now.utc.iso8601(3) })
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+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

data/lib/logasm/adapters/rabbitmq_adapter.rb

@@ -0,0 +1,43 @@
+begin
+  require 'freddy'
+rescue LoadError => e
+  raise unless e.message =~ /freddy/
+  exception = e.exception('To use RabbitMQ adapter for logging, please install freddy!')
+  exception.set_backtrace(e.backtrace)
+  raise exception
+end
+
+require_relative 'rabbitmq_adapter/message_builder'
+
+class Logasm
+  module Adapters
+    class RabbitmqAdapter
+      attr_reader :publisher
+
+      CONFIGURATION_KEYS = [:host, :user, :pass, :port]
+
+      def initialize(level, service, arguments = {})
+        config = arguments.select { |key, value| CONFIGURATION_KEYS.include?(key) }
+        logger = Logger.new(STDOUT)
+        @queue = arguments.fetch(:queue, 'logstash-queue')
+        @level = level
+
+        @message_builder = MessageBuilder.new(service)
+        @freddy = Freddy.build(logger, config)
+      end
+
+      def log(level, metadata = {})
+        if meets_threshold?(level)
+          message = @message_builder.build_message metadata, level
+          @freddy.deliver @queue, metadata
+        end
+      end
+
+      private
+
+      def meets_threshold?(level)
+        LOG_LEVELS.index(level.to_s) >= @level
+      end
+    end
+  end
+end

data/lib/logasm/adapters/stdout_adapter.rb

@@ -10,8 +10,8 @@ class Logasm
 
       def log(level, metadata = {})
         message = metadata[:message]
-        metadata.delete(:message)
-        log_data = [message, metadata.empty? ? nil : metadata.to_json].compact.join(' ')
+        data = metadata.select { |key, value| key != :message }
+        log_data = [message, data.empty? ? nil : data.to_json].compact.join(' ')
 
         @logger.public_send level, log_data
       end

data/lib/logasm/adapters.rb

@@ -3,6 +3,7 @@ class Logasm
     LOG_LEVELS = %w(debug info warn error fatal unknown).freeze
 
     def self.get(type, service_name, arguments)
+      require_relative "adapters/#{type.to_s}_adapter"
       adapter = const_get(Inflecto.camelize(type.to_s) + 'Adapter')
       level = LOG_LEVELS.index(arguments.fetch(:level, 'debug'))
       adapter.new(level, service_name, arguments)

data/lib/logasm.rb

@@ -1,9 +1,6 @@
 require 'inflecto'
 require 'logger'
 require_relative 'logasm/adapters'
-require_relative 'logasm/adapters/stdout_adapter'
-require_relative 'logasm/adapters/logstash_adapter'
-require_relative 'logasm/adapters/logstash_adapter/formatter'
 
 class Logasm
   def self.build(service_name, loggers_config)

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.1.1'
+  gem.version       = '0.2.0'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}
@@ -21,4 +21,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"
 end

data/spec/adapters/logstash_adapter/formatter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require_relative '../../../lib/logasm/adapters/logstash_adapter/formatter'
 
 describe Logasm::Adapters::LogstashAdapter::Formatter do
   subject(:event) { JSON.parse(formatter.call(severity, time, nil, message)) }

data/spec/adapters/logstash_adapter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require_relative '../../lib/logasm/adapters/logstash_adapter'
 
 describe Logasm::Adapters::LogstashAdapter do
   let(:logstash) { described_class.new(0, 'test_service', { host: 'localhost', port: '5228'}) }

data/spec/adapters/rabbitmq_adapter/message_builder_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require_relative '../../../lib/logasm/adapters/rabbitmq_adapter/message_builder'
+
+describe Logasm::Adapters::RabbitmqAdapter::MessageBuilder do
+  subject { message_builder.build_message(metadata, level) }
+
+  let(:message_builder) { described_class.new(service_name) }
+  let(:service_name) { 'test_service' }
+  let(:level) { :info }
+  let(:metadata) { {message: 'test'} }
+
+  it 'adds necessary arguments' do
+    expect(subject[:message]).to eq(metadata[:message])
+    expect(subject[:application]).to eq(service_name)
+    expect(subject[:level]).to eq(level)
+    expect(subject).to have_key(:host)
+    expect(subject).to have_key(:@timestamp)
+  end
+end

data/spec/adapters/rabbitmq_adapter_spec.rb

@@ -0,0 +1,39 @@
+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
+
+  describe '#log' do
+    context 'when logging a message' do
+      let(:adapter) { described_class.new(0, nil, { host: 'localhost',
+                                                    user: 'guest',
+                                                    pass: 'guest',
+                                                    port: '5672' }
+                                          ) }
+
+      it 'delegates to publisher' do
+        expect(publisher).to receive(:publish)
+
+        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' }
+                                          ) }
+
+      it 'does not delegate to freddy' do
+        expect(publisher).not_to receive(:publish)
+        adapter.log :info, message: 'test'
+      end
+    end
+  end
+end

data/spec/adapters/stdout_adapter_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'logasm'
+require_relative '../../lib/logasm/adapters/stdout_adapter'
 
 describe Logasm::Adapters::StdoutAdapter do
   it 'creates a stdout logger' do

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: freddy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: It's logasmic
 email:
 - support@salemove.com
@@ -85,10 +99,15 @@ files:
 - lib/logasm/adapters.rb
 - lib/logasm/adapters/logstash_adapter.rb
 - 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
 - spec/adapters/logstash_adapter_spec.rb
+- spec/adapters/rabbitmq_adapter/message_builder_spec.rb
+- spec/adapters/rabbitmq_adapter_spec.rb
 - spec/adapters/stdout_adapter_spec.rb
 - spec/logasm_spec.rb
 - spec/spec_helper.rb
@@ -119,6 +138,8 @@ summary: What description said
 test_files:
 - spec/adapters/logstash_adapter/formatter_spec.rb
 - spec/adapters/logstash_adapter_spec.rb
+- spec/adapters/rabbitmq_adapter/message_builder_spec.rb
+- spec/adapters/rabbitmq_adapter_spec.rb
 - spec/adapters/stdout_adapter_spec.rb
 - spec/logasm_spec.rb
 - spec/spec_helper.rb