logstash-logger 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5f101aba35d73c9bb62e77c6a5be82321c54de
-  data.tar.gz: 85d7303ebb637bda83b42dec2794c7551983e22e
+  metadata.gz: cc77de67a993f6d92e48eb51a03403545adb4a36
+  data.tar.gz: 155105ccaa41672d379ba39f1f58891079814ef1
 SHA512:
-  metadata.gz: 0ce2d236f92070efa47bf40cbc708a2fa3c12d65f1e611813b6170678ce4b00e5889661f0e9b9d3ce7760f0f6eef12ea1773eb9ac98b843f8ae57f0514d4463f
-  data.tar.gz: 5c038e89a27a7467a76da3a7715d2161ca5afdf3f1bd6ec25216c433aaedd979399cbc0d133dd96b20760970637543814ddea4f80314612df174d915f369f3d7
+  metadata.gz: 49065907ddd39ea7dce437da0d9e4d640667a48d056f487b23948a6a4a97bb2d8a117c6370a430b9465f739b3225a1ac8cb9419f8144928b30af78a118c18a96
+  data.tar.gz: 945c34c855bf8f0fe36b1a40d8b6daaf72ac452590da3e8f3d74069f3fdcc41865f6926513255bd2bca91e661130dbe7ec8a1f82d5813879ca625fd9df7ee135

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.0
+- Support for sending messages to multiple loggers. Each one can have a different formatter. [#58](https://github.com/dwbutler/logstash-logger/pull/58)
+- Fixes tagged logging support when using a custom formatter.
+
 ## 0.12.0
 - Support for other formatters, including custom formatters. [#56](https://github.com/dwbutler/logstash-logger/pull/56)
 - Support for CEE output.

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-#gem 'json', :platform => :ruby_18
+gem 'codecov', require: false, group: :test

data/README.md

@@ -1,15 +1,16 @@
 # LogStashLogger
-[![Build Status](https://travis-ci.org/dwbutler/logstash-logger.png?branch=master)](https://travis-ci.org/dwbutler/logstash-logger) [![Code Climate](https://codeclimate.com/github/dwbutler/logstash-logger.png)](https://codeclimate.com/github/dwbutler/logstash-logger)
+[![Build Status](https://travis-ci.org/dwbutler/logstash-logger.svg?branch=master)](https://travis-ci.org/dwbutler/logstash-logger) [![Code Climate](https://codeclimate.com/github/dwbutler/logstash-logger/badges/gpa.svg)](https://codeclimate.com/github/dwbutler/logstash-logger) [![codecov.io](http://codecov.io/github/dwbutler/logstash-logger/coverage.svg?branch=master)](http://codecov.io/github/dwbutler/logstash-logger?branch=master)
 
-This gem implements a subclass of Ruby's Logger class that logs directly to [logstash](http://logstash.net).
-It writes to a logstash listener over a UDP (default) or TCP connection, in logstash JSON format. This is an improvement over
+LogStashLogger extends Ruby's `Logger` class to log directly to [logstash](http://logstash.net).
+It supports writing to various outputs in logstash JSON format. This is an improvement over
 writing to a file or syslog since logstash can receive the structured data directly.
 
 ## Features
 
 * Can write directly to logstash over a UDP or TCP/SSL connection.
 * Can write to a file, Redis, a unix socket, stdout or stderr.
-* Always writes in logstash JSON format.
+* Writes in logstash JSON format, but supports other formats as well.
+* Can write to multiple outputs.
 * Logger can take a string message, a hash, a `LogStash::Event`, an object, or a JSON string as input.
 * Events are automatically populated with message, timestamp, host, and severity.
 * Easily integrates with Rails via configuration.
@@ -50,16 +51,53 @@ stderr_logger = LogStashLogger.new(type: :stderr)
 io_logger = LogStashLogger.new(type: :io, io: io)
 
 # Use a different formatter
-cee_logger = LogStashLogger.new(type: :tcp, host: 'logsene-receiver-syslog.sematext.com', port: 514, formatter: :cee_syslog)
-custom_formatted_logger = LogStashLogger.new(type: :redis, formatter: MyCustomFormatter)
-lambda_formatted_logger = LogStashLogger.new(type: :stdout, formatter: ->(severity, time, progname, msg) { "[#{progname}] #{msg}" })
-ruby_default_formatter_logger = LogStashLogger.new(type: :file, path: 'log/development.log', formatter: ::Logger::Formatter)
-
-# Multiple Outputs
-multi_logger = LogStashLogger.new([{type: :file, path: 'log/development.log'}, {type: :udp, host: 'localhost', port: 5228}])
-
-# Balancing messages between several outputs
-balancer_logger = LogStashLogger.new(type: :balancer, outputs: [{type: :udp, host: 'host1', port: 5228}, {type: :udp, host: 'host2', port: 5228}])
+cee_logger = LogStashLogger.new(
+  type: :tcp,
+  host: 'logsene-receiver-syslog.sematext.com',
+  port: 514,
+  formatter: :cee_syslog
+)
+
+custom_formatted_logger = LogStashLogger.new(
+  type: :redis,
+  formatter: MyCustomFormatter
+)
+
+lambda_formatted_logger = LogStashLogger.new(
+  type: :stdout,
+  formatter: ->(severity, time, progname, msg) { "[#{progname}] #{msg}" }
+)
+
+ruby_default_formatter_logger = LogStashLogger.new(
+  type: :file,
+  path: 'log/development.log',
+  formatter: ::Logger::Formatter
+)
+
+# Send messages to multiple outputs. Each output will have the same format.
+multi_delegating_logger = LogStashLogger.new(
+  type: :multi_delegator,
+  outputs: [
+    { type: :file, path: 'log/development.log' },
+    { type: :udp, host: 'localhost', port: 5228 }
+  ])
+
+# Balance messages between several outputs
+balancer_logger = LogStashLogger.new(
+  type: :balancer,
+  outputs: [
+    { type: :udp, host: 'host1', port: 5228 },
+    { type: :udp, host: 'host2', port: 5228 }
+  ])
+
+# Send messages to multiple loggers.
+# Use this if you need to send different formats to different outputs.
+multi_logger = LogStashLogger.new(
+  type: :multi_logger,
+  outputs: [
+    { type: :file, path: 'log/development.log', formatter: ::Logger::Formatter },
+    { type: :tcp, host: 'localhost', port: 5228, formatter: :json }
+  ])
 
 # The following messages are written to UDP port 5228:
 
@@ -223,6 +261,10 @@ config.autoflush_log = true
 
 # Optional, use a URI to configure. Useful on Heroku
 config.logstash.uri = ENV['LOGSTASH_URI']
+
+# Optional. Defaults to :json_lines. If there are multiple outputs,
+# they will all share the same formatter.
+config.logstash.formatter = :json_lines
 ```
 
 #### UDP
@@ -331,10 +373,14 @@ config.logstash.type = :io
 config.logstash.io = io
 ```
 
-#### Multiple Outputs
+#### Multi Delegator
 
 ```ruby
-config.logstash = [
+# Required
+config.logstash.type = :multi_delegator
+
+# Required
+config.logstash.outputs = [
   {
     type: :file,
     path: 'log/production.log'
@@ -347,6 +393,27 @@ config.logstash = [
 ]
 ```
 
+#### Multi Logger
+
+```ruby
+# Required
+config.logstash.type = :multi_logger
+
+# Required. Each logger may have its own formatter.
+config.logstash.outputs = [
+  {
+    type: :file,
+    path: 'log/production.log',
+    formatter: ::Logger::Formatter
+  },
+  {
+    type: :udp,
+    port: 5228,
+    host: 'localhost'
+  }
+]
+```
+
 ### Logging HTTP request data
 
 In web applications, you can log data from HTTP requests (such as headers) using the
@@ -421,6 +488,11 @@ This is most likely not a problem with LogStashLogger, but rather a different ge
 This is especially likely if you're using a threaded server such as Puma, since gems often change the log level of
 `Rails.logger` in a non thread-safe way. See [#17](https://github.com/dwbutler/logstash-logger/issues/17) for more information.
 
+### Sometimes two lines of JSON log messages get sent as one message
+If you're using UDP output and writing to a logstash listener, you are most likely encountering a bug in the UDP implementation
+of the logstash listener. There is no known fix at this time. See [#43](https://github.com/dwbutler/logstash-logger/issues/43)
+for more information.
+
 ## Breaking changes
 
 ### Version 0.5+
@@ -457,6 +529,8 @@ logger = LogStashLogger.new('localhost', 5228, :tcp)
 * [Vadim Kazakov](https://github.com/yads)
 * [Anil Rhemtulla](https://github.com/AnilRh)
 * [Nikita Vorobei](https://github.com/Nikita-V)
+* [fireboy1919](https://github.com/fireboy1919)
+* [Mike Gunderloy](https://github.com/ffmike)
 
 ## Contributing
 

data/gemfiles/rails_3.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "codecov", :require => false, :group => :test
 gem "rails", "~> 3.2.18"
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "codecov", :require => false, :group => :test
 gem "rails", "~> 4.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "codecov", :require => false, :group => :test
 gem "rails", "~> 4.1.1"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "codecov", :require => false, :group => :test
 gem "rails", "~> 4.2.0"
 
 gemspec :path => "../"

data/lib/logstash-logger/device.rb

@@ -21,17 +21,7 @@ module LogStashLogger
 
     def self.new(opts)
       opts = opts.dup
-
-      if opts.is_a?(Array)
-        # Multiple device configs supplied... create a MultiDelegator
-        devices = opts.map{|opt| build_device(opt)}
-        Device::MultiDelegator.new(*devices)
-      elsif Hash
-        # Create a single device
-        build_device(opts)
-      else
-        raise ArgumentError, "Invalid device options: must be a Hash or an Array of Hashes"
-      end
+      build_device(opts)
     end
 
     def self.build_device(opts)
@@ -63,8 +53,9 @@ module LogStashLogger
         when :io then IO
         when :stdout then Stdout
         when :stderr then Stderr
+        when :multi_delegator then MultiDelegator
         when :balancer then Balancer
-        else fail ArgumentError, 'Invalid type'
+        else fail ArgumentError, 'Invalid device type'
       end
     end
   end

data/lib/logstash-logger/device/balancer.rb

@@ -13,7 +13,7 @@ module LogStashLogger
       private
 
       def create_devices(opts)
-        opts.map { |o| Device.new(o) }
+        opts.map { |device_opts| Device.new(device_opts) }
       end
 
       def self.delegate_to_all(*methods)

data/lib/logstash-logger/device/multi_delegator.rb

@@ -8,14 +8,20 @@ module LogStashLogger
     class MultiDelegator < Base
       attr_reader :devices
 
-      def initialize(*devices)
+      def initialize(opts)
         @io = self
-        @devices = devices
+        @devices = create_devices(opts[:outputs])
         self.class.delegate(:write, :close, :flush)
       end
 
       private
 
+      def create_devices(opts)
+        opts.map do |device_opts|
+          Device.new(device_opts)
+        end
+      end
+
       def self.delegate(*methods)
         methods.each do |m|
           define_method(m) do |*args|

data/lib/logstash-logger/formatter.rb

@@ -17,13 +17,16 @@ module LogStashLogger
     def self.build_formatter(formatter_type)
       formatter_type ||= DEFAULT_FORMATTER
 
-      if custom_formatter_instance?(formatter_type)
+      formatter = if custom_formatter_instance?(formatter_type)
         formatter_type
       elsif custom_formatter_class?(formatter_type)
         formatter_type.new
       else
         formatter_klass(formatter_type).new
       end
+
+      formatter.send(:extend, ::LogStashLogger::TaggedLogging::Formatter)
+      formatter
     end
 
     def self.formatter_klass(formatter_type)

data/lib/logstash-logger/logger.rb

@@ -2,17 +2,11 @@ require 'logger'
 require 'logstash-logger/tagged_logging'
 
 module LogStashLogger
+  autoload :MultiLogger, 'logstash-logger/multi_logger'
+
   def self.new(*args)
     opts = extract_opts(*args)
-    formatter = Formatter.new(opts.delete(:formatter))
-    device = Device.new(opts)
-
-    ::Logger.new(device).tap do |logger|
-      logger.instance_variable_set(:@device, device)
-      logger.extend(self)
-      logger.extend(TaggedLogging)
-      logger.formatter = formatter
-    end
+    build_logger(opts)
   end
 
   def self.extended(base)
@@ -22,7 +16,7 @@ module LogStashLogger
       end
 
       def flush
-        !!@device.flush
+        !!(@device.flush if @device.respond_to?(:flush))
       end
     end
   end
@@ -34,13 +28,14 @@ module LogStashLogger
 
     if args.length > 1
       if args.all?{|arg| arg.is_a?(Hash)}
-        # Array of Hashes
-        args
+        # Deprecated array of hashes
+        warn "[LogStashLogger] Passing an array of hashes to the constructor is deprecated. Please replace with an options hash: { type: :multi_delegator, outputs: [...] }"
+        { type: :multi_delegator, outputs: args }
       else
-        # Deprecated host/port/type syntax
-        puts "[LogStashLogger] (host, port, type) constructor is deprecated. Please use an options hash instead."
+        # Deprecated host/port/type constructor
+        warn "[LogStashLogger] The (host, port, type) constructor is deprecated. Please use an options hash instead."
         host, port, type = *args
-        {host: host, port: port, type: type}
+        { host: host, port: port, type: type }
       end
     elsif Hash === args[0]
       args[0]
@@ -48,4 +43,22 @@ module LogStashLogger
       fail ArgumentError, "Invalid LogStashLogger options"
     end
   end
+
+  def self.build_logger(opts)
+    case opts[:type]
+    when :multi_logger
+      loggers = opts[:outputs].map {|logger_opts| build_logger(logger_opts) }
+      MultiLogger.new(loggers)
+    else
+      formatter = Formatter.new(opts.delete(:formatter))
+      device = Device.new(opts)
+
+      ::Logger.new(device).tap do |logger|
+        logger.instance_variable_set(:@device, device)
+        logger.extend(self)
+        logger.extend(TaggedLogging)
+        logger.formatter = formatter
+      end
+    end
+  end
 end

data/lib/logstash-logger/multi_logger.rb

@@ -0,0 +1,135 @@
+# Adapted from https://github.com/ffmike/multilogger
+module LogStashLogger
+  class MultiLogger < ::Logger
+    def level=(value)
+      super
+      @loggers.each do |logger|
+        logger.level = value
+      end
+    end
+
+    def progname=(value)
+      super
+      @loggers.each do |logger|
+        logger.progname = value
+      end
+    end
+
+    def datetime_format=(datetime_format)
+      super
+      @loggers.each do |logger|
+        logger.datetime_format = datetime_format
+      end
+    end
+
+    def formatter=(formatter)
+      @loggers.each do |logger|
+        logger.formatter = formatter
+      end
+    end
+
+    # Array of Loggers to be logged to. These can be anything that acts reasonably like a Logger.
+    attr_accessor :loggers
+
+    # Any method not defined on standard Logger class, just send it on to anyone who will listen
+    def method_missing(name, *args, &block)
+      @loggers.each do |logger|
+        if logger.respond_to?(name)
+          logger.send(name, args, &block)
+        end
+      end
+    end
+
+    #
+    # === Synopsis
+    #
+    #   MultiLogger.new([logger1, logger2])
+    #
+    # === Args
+    #
+    # +loggers+::
+    #   An array of loggers. Each one gets every message that is sent to the MultiLogger instance
+    #
+    # === Description
+    #
+    # Create an instance.
+    #
+    def initialize(loggers)
+      @loggers = []
+      super(nil)
+      @loggers = Array(loggers)
+    end
+
+    # Methods that write to logs just write to each contained logger in turn
+    def add(severity, message = nil, progname = nil, &block)
+      @loggers.each do |logger|
+        logger.add(severity, message, progname, &block)
+      end
+    end
+
+    def <<(msg)
+      @loggers.each do |logger|
+        logger << msg
+      end
+    end
+
+    def debug(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.debug(progname, &block)
+      end
+    end
+
+    def info(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.info(progname, &block)
+      end
+    end
+
+    def warn(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.warn(progname, &block)
+      end
+    end
+
+    def error(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.error(progname, &block)
+      end
+    end
+
+    def fatal(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.fatal(progname, &block)
+      end
+    end
+
+    def unknown(progname = nil, &block)
+      @loggers.each do |logger|
+        logger.unknown(progname, &block)
+      end
+    end
+
+    def close
+      @loggers.each do |logger|
+        logger.close if logger.respond_to?(:close)
+      end
+    end
+
+    module TaggedLogging
+      def tagged(*tags)
+        @loggers.each do |logger|
+          logger.formatter.tagged(*tags) { yield self }
+        end
+      end
+
+      def flush
+        @loggers.each do |logger|
+          logger.formatter.clear_tags!
+        end
+        super if defined?(super)
+      end
+    end
+
+    include TaggedLogging
+  end
+end

data/lib/logstash-logger/version.rb

@@ -1,3 +1,3 @@
 module LogStashLogger
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/logstash-logger.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rails'
   gem.add_development_dependency 'redis'
   gem.add_development_dependency 'poseidon'
+
   gem.add_development_dependency 'rspec', '>= 3'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'

data/spec/device/balancer_spec.rb

@@ -4,10 +4,7 @@ describe LogStashLogger::Device::Balancer do
   include_context 'device'
 
   # Create a Balancer writing to both STDOUT and a StringIO
-  let(:subject) { balancer_device }
-
-  let(:stdout) { $stdout }
-  let(:io) { StringIO.new }
+  subject { balancer_device }
 
   describe '#write' do
     before do
@@ -16,7 +13,7 @@ describe LogStashLogger::Device::Balancer do
 
     it "writes to one device" do
       expect(io).to receive(:write).once
-      expect(stdout).to_not receive(:write)
+      expect($stdout).to_not receive(:write)
       subject.write("log message")
     end
   end

data/spec/device/file_spec.rb

@@ -9,7 +9,7 @@ describe LogStashLogger::Device::File do
 
   context "when path is not specified" do
     it "raises an exception" do
-      expect { described_class.new }.to raise_error
+      expect { described_class.new }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/device/io_spec.rb

@@ -3,8 +3,7 @@ require 'logstash-logger'
 describe LogStashLogger::Device::IO do
   include_context 'device'
 
-  let(:subject) { io_device }
-  let(:io) { StringIO.new }
+  subject { io_device }
 
   it "writes to the IO object" do
     expect(subject.to_io).to eq(io)

data/spec/device/multi_delegator_spec.rb

@@ -4,16 +4,10 @@ describe LogStashLogger::Device::MultiDelegator do
   include_context 'device'
 
   # Create a MultiDelegator writing to both STDOUT and a StringIO
-  let(:subject) { multi_delegator_device }
+  subject { multi_delegator_device }
 
-  let(:stdout) { $stdout }
-  let(:io) { StringIO.new }
-
-  it "writes to $stdout" do
-    # MultiDelegator writes to stdout
-    expect(stdout).to receive(:write).once
-
-    # MultiDelegator writes to IO
+  it "writes to all outputs" do
+    expect($stdout).to receive(:write).once
     expect(io).to receive(:write).once
 
     subject.write("test")

data/spec/device/socket_spec.rb

@@ -9,7 +9,7 @@ describe LogStashLogger::Device::Socket do
 
   context "when port is not specified" do
     it "raises an exception" do
-      expect { described_class.new }.to raise_error
+      expect { described_class.new }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/device/unix_spec.rb

@@ -16,7 +16,7 @@ describe LogStashLogger::Device::Unix do
 
   context "when path is not specified" do
     it "raises an exception" do
-      expect { described_class.new }.to raise_error
+      expect { described_class.new }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/device_spec.rb

@@ -40,7 +40,7 @@ describe LogStashLogger::Device do
 
     context "when uri is invalid" do
       let(:uri_config) { invalid_uri_config }
-      specify { expect{ parse_uri_config }.to raise_error(URI::InvalidURIError) }
+      specify { expect { parse_uri_config }.to raise_error(URI::InvalidURIError) }
     end
   end
 

data/spec/formatter_spec.rb

@@ -25,27 +25,54 @@ describe LogStashLogger::Formatter do
     end
 
     context "custom formatter" do
-      it "returns a new instance of a custom formatter class" do
-        expect(described_class.new(::Logger::Formatter)).to be_a ::Logger::Formatter
+      subject { described_class.new(formatter) }
+
+      context "formatter class" do
+        let(:formatter) { ::Logger::Formatter }
+
+        it "returns a new instance of the class" do
+          expect(subject).to be_a formatter
+        end
       end
 
-      it "returns the same formatter instance if a custom formatter instance is passed in" do
-        formatter = ::Logger::Formatter.new
-        expect(described_class.new(formatter)).to eql(formatter)
+      context "formatter instance" do
+        let(:formatter) { ::Logger::Formatter.new }
+
+        it "returns the same formatter instance" do
+          expect(subject).to eql(formatter)
+        end
+
+        it "supports tagged logging" do
+          expect(subject).to be_a ::LogStashLogger::TaggedLogging::Formatter
+        end
       end
 
-      it "returns a formatter proc if it is passed in" do
-        formatter = proc do |severity, time, progname, msg|
-          msg
+      context "formatter proc" do
+        let(:formatter) do
+          proc { |severity, time, progname, msg| msg }
+        end
+
+        it "returns the same formatter proc" do
+          expect(subject).to eql(formatter)
+        end
+
+        it "supports tagged logging" do
+          expect(subject).to be_a ::LogStashLogger::TaggedLogging::Formatter
         end
-        expect(described_class.new(formatter)).to eql(formatter)
       end
 
-      it "returns a formatter lambda if it is passed in" do
-        formatter = lambda do |severity, time, progname, msg|
-          msg
+      context "formatter lambda" do
+        let(:formatter) do
+          ->(severity, time, progname, msg) { msg }
+        end
+
+        it "returns the same formatter lambda" do
+          expect(subject).to eql(formatter)
+        end
+
+        it "supports tagged logging" do
+          expect(subject).to be_a ::LogStashLogger::TaggedLogging::Formatter
         end
-        expect(described_class.new(formatter)).to eql(formatter)
       end
     end
   end

data/spec/multi_logger_spec.rb

@@ -0,0 +1,52 @@
+require 'logstash-logger'
+
+describe LogStashLogger::MultiLogger do
+  include_context 'device'
+
+  # Create a MultiLogger writing to both STDOUT and a StringIO
+  subject { multi_logger }
+
+  it { is_expected.to be_a LogStashLogger::MultiLogger }
+
+  it "has multiple loggers" do
+    expect(subject.loggers.count).to eq(2)
+  end
+
+  it "has one logger per output" do
+    expect(subject.loggers[0].device).to be_a LogStashLogger::Device::Stdout
+    expect(subject.loggers[1].device).to be_a LogStashLogger::Device::IO
+  end
+
+  it "allows a different formatter for each logger" do
+    expect(subject.loggers[0].formatter).to be_a ::Logger::Formatter
+    expect(subject.loggers[1].formatter).to be_a LogStashLogger::Formatter::JsonLines
+  end
+
+  it "logs to all loggers" do
+    subject.loggers.each do |logger|
+      expect(logger).to receive(:info).with("test")
+    end
+
+    multi_logger.info("test")
+  end
+
+  context "tagged logging" do
+    it "forwards tags to each logger's formatter" do
+      subject.loggers.each do |logger|
+        expect(logger.formatter).to receive(:tagged).with("foo")
+      end
+
+      subject.tagged("foo") do |logger|
+        logger.debug("bar")
+      end
+    end
+
+    it "clears tags on each logger's formatter when flushing" do
+      subject.loggers.each do |logger|
+        expect(logger.formatter).to receive(:clear_tags!)
+      end
+
+      subject.flush
+    end
+  end
+end

data/spec/rails_spec.rb

@@ -52,21 +52,23 @@ describe LogStashLogger do
         end
       end
 
-      context "when configured with multiple devices" do
+      context "when configuring a multi delegator" do
         before(:each) do
-          app.config.logstash = [
+          app.config.logstash.type = :multi_delegator
+          app.config.logstash.outputs = [
             {
               type: :udp,
               uri: udp_uri
             },
             {
-              type: :file
+              type: :file,
+              path: '/tmp/foo.log'
             }
           ]
           LogStashLogger.setup(app)
         end
 
-        it "uses a multi-delegator" do
+        it "uses a multi delegator" do
           expect(subject.device).to be_a LogStashLogger::Device::MultiDelegator
           expect(subject.device.devices.map(&:class)).to eq([
             LogStashLogger::Device::UDP,

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
 require 'pry'
 
+require 'simplecov'
+SimpleCov.start
+if ENV['CI']=='true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 RSpec.configure do |config|
   config.order = "random"
 
@@ -49,12 +56,24 @@ RSpec.shared_context 'device' do
   let(:file) { Tempfile.new('test') }
   let(:file_device) { LogStashLogger::Device.new(type: :file, path: file.path)}
 
+  let(:io) { StringIO.new }
   let(:io_device) { LogStashLogger::Device.new(type: :io, io: io)}
 
   let(:redis_device) { LogStashLogger::Device.new(type: :redis, sync: true) }
   let(:kafka_device) { LogStashLogger::Device.new(type: :kafka, sync: true) }
-  let(:multi_delegator_device) { LogStashLogger::Device.new([{type: :stdout}, {type: :io, io: io}]) }
-  let(:balancer_device) { LogStashLogger::Device.new(type: :balancer, outputs: [{type: :stdout}, {type: :io, io: io}]) }
+
+  let(:outputs) { [{type: :stdout}, {type: :io, io: io}] }
+  let(:multi_delegator_device) { LogStashLogger::Device.new(type: :multi_delegator, outputs: outputs) }
+  let(:balancer_device) { LogStashLogger::Device.new(type: :balancer, outputs: outputs) }
+  let(:multi_logger) do
+    LogStashLogger.new(
+        type: :multi_logger,
+        outputs: [
+            { type: :stdout, formatter: ::Logger::Formatter },
+            { type: :io, io: io }
+        ]
+    )
+  end
 
   let(:udp_uri) { "udp://localhost:5228" }
   let(:tcp_uri) { "tcp://localhost:5229" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -195,6 +195,7 @@ files:
 - lib/logstash-logger/formatter/json_lines.rb
 - lib/logstash-logger/formatter/logstash_event.rb
 - lib/logstash-logger/logger.rb
+- lib/logstash-logger/multi_logger.rb
 - lib/logstash-logger/railtie.rb
 - lib/logstash-logger/tagged_logging.rb
 - lib/logstash-logger/version.rb
@@ -229,6 +230,7 @@ files:
 - spec/formatter/logstash_event_spec.rb
 - spec/formatter_spec.rb
 - spec/logger_spec.rb
+- spec/multi_logger_spec.rb
 - spec/rails_spec.rb
 - spec/spec_helper.rb
 - spec/tagged_logging_spec.rb
@@ -279,6 +281,7 @@ test_files:
 - spec/formatter/logstash_event_spec.rb
 - spec/formatter_spec.rb
 - spec/logger_spec.rb
+- spec/multi_logger_spec.rb
 - spec/rails_spec.rb
 - spec/spec_helper.rb
 - spec/tagged_logging_spec.rb