semantic_logger 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67fae09283837194e489b469dace9f3b5103901
-  data.tar.gz: fc112ededd82585ff40307585e65769ab92601ce
+  metadata.gz: 65aba46ee7052dc3653a61a40fad4d69aed81e97
+  data.tar.gz: 2c7b49cb33e90874a966b9cadbbadf99bc4f4291
 SHA512:
-  metadata.gz: a548305f79d04f28a1c2989132eb148f29da9415a5a3bc06b7879d7d95cabe94627533ad56c50a925137f3dfeca1dec62c43707472ade54eb331fd9f764f91a4
-  data.tar.gz: 7bf65721bfb19e865601ef929774877ab514607d86f150e86bb59be969cbecf080d2330e83c8ae2ba4aa2c44ea9b428773e5a791e281a142aeb20b4028036492
+  metadata.gz: a2ef7fb0d78bdb3ecac1ff6d8ef6cef1bb4797a7a0ac55b2cfab4f057d8f7c2c16519b37863a6fc1d8e728277765c678824d8234e3cfdf733386cf7f5ddeb073
+  data.tar.gz: e8df29aebb5e16b47fe87d530daf5f822c436ab18ddba47d682799ddb5c048041ce63841f1c6430987ca89e196f99853c48ecb38c8a9b2a0b65b8e3fbfae1d7a

data/README.md

@@ -1,9 +1,9 @@
-# semantic_logger
+# Semantic Logger
 [![Gem Version](https://img.shields.io/gem/v/semantic_logger.svg)](https://rubygems.org/gems/semantic_logger) [![Build Status](https://travis-ci.org/rocketjob/semantic_logger.svg?branch=master)](https://travis-ci.org/rocketjob/semantic_logger) [![Downloads](https://img.shields.io/gem/dt/semantic_logger.svg)](https://rubygems.org/gems/semantic_logger) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
 
-Low latency, high throughput, enterprise-scale logging system for Ruby.
+Semantic Logger is a feature rich logging framework, and replacement for existing Ruby & Rails loggers.  
 
-* http://github.com/rocketjob/semantic_logger
+* https://rocketjob.github.io/semantic_logger/
 
 ## Documentation
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake/clean'
 require 'rake/testtask'
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'semantic_logger/version'
 
 task :gem do

data/lib/semantic_logger/ansi_colors.rb

@@ -1,16 +1,16 @@
 module SemanticLogger
   # Formatting & colors used by optional color formatter
   module AnsiColors
-    CLEAR   = "\e[0m"
-    BOLD    = "\e[1m"
-    BLACK   = "\e[30m"
-    RED     = "\e[31m"
-    GREEN   = "\e[32m"
-    YELLOW  = "\e[33m"
-    BLUE    = "\e[34m"
-    MAGENTA = "\e[35m"
-    CYAN    = "\e[36m"
-    WHITE   = "\e[37m"
+    CLEAR   = "\e[0m".freeze
+    BOLD    = "\e[1m".freeze
+    BLACK   = "\e[30m".freeze
+    RED     = "\e[31m".freeze
+    GREEN   = "\e[32m".freeze
+    YELLOW  = "\e[33m".freeze
+    BLUE    = "\e[34m".freeze
+    MAGENTA = "\e[35m".freeze
+    CYAN    = "\e[36m".freeze
+    WHITE   = "\e[37m".freeze
 
     # DEPRECATED - NOT USED
     LEVEL_MAP = {
@@ -20,7 +20,6 @@ module SemanticLogger
       warn:  BOLD,
       error: RED,
       fatal: RED
-    }
+    }.freeze
   end
-
 end

data/lib/semantic_logger/appender.rb

@@ -61,15 +61,13 @@ module SemanticLogger
       end
     end
 
-    private
-
-    ASYNC_OPTION_KEYS = [:max_queue_size, :lag_threshold_s, :batch_size, :batch_seconds, :lag_check_interval]
+    ASYNC_OPTION_KEYS = %i[max_queue_size lag_threshold_s batch_size batch_seconds lag_check_interval].freeze
 
     # Returns [Subscriber] instance from the supplied options.
     def self.build(options, &block)
       if options[:io] || options[:file_name]
         SemanticLogger::Appender::File.new(options, &block)
-      elsif appender = options.delete(:appender)
+      elsif (appender = options.delete(:appender))
         if appender.is_a?(Symbol)
           SemanticLogger::Utils.constantize_symbol(appender).new(options)
         elsif appender.is_a?(Subscriber)
@@ -77,7 +75,7 @@ module SemanticLogger
         else
           raise(ArgumentError, "Parameter :appender must be either a Symbol or an object derived from SemanticLogger::Subscriber, not: #{appender.inspect}")
         end
-      elsif appender = options.delete(:metric)
+      elsif (appender = options.delete(:metric))
         if appender.is_a?(Symbol)
           SemanticLogger::Utils.constantize_symbol(appender, 'SemanticLogger::Metric').new(options)
         elsif appender.is_a?(Subscriber)
@@ -90,5 +88,6 @@ module SemanticLogger
       end
     end
 
+    private_class_method :build
   end
 end

data/lib/semantic_logger/appender/async.rb

@@ -22,9 +22,6 @@ module SemanticLogger
       # Appender proxy to allow an existing appender to run asynchronously in a separate thread.
       #
       # Parameters:
-      #   name: [String]
-      #     Name to use for the log thread and the log name when logging any errors from this appender.
-      #
       #   max_queue_size: [Integer]
       #     The maximum number of log messages to hold on the queue before blocking attempts to add to the queue.
       #     -1: The queue size is uncapped and will never block no matter how long the queue is.
@@ -38,7 +35,6 @@ module SemanticLogger
       #     Number of messages to process before checking for slow logging.
       #     Default: 1,000
       def initialize(appender:,
-                     name: appender.class.name,
                      max_queue_size: 10_000,
                      lag_check_interval: 1_000,
                      lag_threshold_s: 30)
@@ -66,13 +62,13 @@ module SemanticLogger
       #
       # Starts the worker thread if not running.
       def thread
-        return @thread if @thread && @thread.alive?
+        return @thread if @thread&.alive?
         @thread = Thread.new { process }
       end
 
       # Returns true if the worker thread is active
       def active?
-        @thread && @thread.alive?
+        @thread&.alive?
       end
 
       # Add log message for processing.
@@ -99,26 +95,38 @@ module SemanticLogger
         # This thread is designed to never go down unless the main thread terminates
         # or the appender is closed.
         Thread.current.name = logger.name
-        logger.trace "Async: Appender thread active"
+        logger.trace 'Async: Appender thread active'
         begin
           process_messages
         rescue StandardError => exception
           # This block may be called after the file handles have been released by Ruby
-          logger.error('Async: Restarting due to exception', exception) rescue nil
+          begin
+            logger.error('Async: Restarting due to exception', exception)
+          rescue StandardError
+            nil
+          end
           retry
         rescue Exception => exception
           # This block may be called after the file handles have been released by Ruby
-          logger.error('Async: Stopping due to fatal exception', exception) rescue nil
+          begin
+            logger.error('Async: Stopping due to fatal exception', exception)
+          rescue StandardError
+            nil
+          end
         ensure
           @thread = nil
           # This block may be called after the file handles have been released by Ruby
-          logger.trace('Async: Thread has stopped') rescue nil
+          begin
+            logger.trace('Async: Thread has stopped')
+          rescue StandardError
+            nil
+          end
         end
       end
 
       def process_messages
         count = 0
-        while message = queue.pop
+        while (message = queue.pop)
           if message.is_a?(Log)
             appender.log(message)
             count += 1
@@ -150,9 +158,10 @@ module SemanticLogger
       end
 
       def check_lag(log)
-        if (diff = Time.now - log.time) > lag_threshold_s
-          logger.warn "Async: Appender thread has fallen behind by #{diff} seconds with #{queue.size} messages queued up. Consider reducing the log level or changing the appenders"
-        end
+        diff = Time.now - log.time
+        return unless diff > lag_threshold_s
+
+        logger.warn "Async: Appender thread has fallen behind by #{diff} seconds with #{queue.size} messages queued up. Consider reducing the log level or changing the appenders"
       end
 
       # Submit command and wait for reply
@@ -165,7 +174,7 @@ module SemanticLogger
           logger.warn msg
         elsif queue_size > 100
           logger.info msg
-        elsif queue_size > 0
+        elsif queue_size.positive?
           logger.trace msg
         end
 
@@ -173,7 +182,6 @@ module SemanticLogger
         queue << {command: command, reply_queue: reply_queue}
         reply_queue.pop
       end
-
     end
   end
 end

data/lib/semantic_logger/appender/async_batch.rb

@@ -28,7 +28,6 @@ module SemanticLogger
       # * `lag_check_interval` is not applicable to batches, since the first message of every batch
       #   is the oldest and is always checked to see if the lag interval has been exceeded.
       def initialize(appender:,
-                     name: appender.class.name,
                      max_queue_size: 10_000,
                      lag_threshold_s: 30,
                      batch_size: 300,
@@ -39,7 +38,6 @@ module SemanticLogger
         @signal        = Concurrent::Event.new
         super(
           appender:        appender,
-          name:            name,
           max_queue_size:  max_queue_size,
           lag_threshold_s: lag_threshold_s
         )
@@ -79,7 +77,7 @@ module SemanticLogger
               process_message(message)
             end
           end
-          appender.batch(logs) if logs.size > 0
+          appender.batch(logs) if logs.size.positive?
           signal.reset unless queue.size >= batch_size
         end
       end
@@ -89,7 +87,6 @@ module SemanticLogger
         signal.set
         super
       end
-
     end
   end
 end

data/lib/semantic_logger/appender/bugsnag.rb

@@ -9,77 +9,81 @@ end
 # Example:
 #   SemanticLogger.add_appender(appender: :bugsnag)
 #
-class SemanticLogger::Appender::Bugsnag < SemanticLogger::Subscriber
-  # Create Bugsnag Error / Exception Appender
-  #
-  # Parameters
-  #   level: [:trace | :debug | :info | :warn | :error | :fatal]
-  #     Override the log level for this appender.
-  #     Default: :error
-  #
-  #   formatter: [Object|Proc]
-  #     An instance of a class that implements #call, or a Proc to be used to format
-  #     the output from this appender
-  #     Default: Use the built-in formatter (See: #call)
-  #
-  #   filter: [Regexp|Proc]
-  #     RegExp: Only include log messages where the class name matches the supplied.
-  #     regular expression. All other messages will be ignored.
-  #     Proc: Only include log messages where the supplied Proc returns true
-  #           The Proc must return true or false.
-  def initialize(level: :error, formatter: nil, filter: nil, application: nil, host: nil, &block)
-    raise 'Bugsnag only supports :info, :warn, or :error log levels' unless [:info, :warn, :error, :fatal].include?(level)
+module SemanticLogger
+  module Appender
+    class Bugsnag < SemanticLogger::Subscriber
+      # Create Bugsnag Error / Exception Appender
+      #
+      # Parameters
+      #   level: [:trace | :debug | :info | :warn | :error | :fatal]
+      #     Override the log level for this appender.
+      #     Default: :error
+      #
+      #   formatter: [Object|Proc]
+      #     An instance of a class that implements #call, or a Proc to be used to format
+      #     the output from this appender
+      #     Default: Use the built-in formatter (See: #call)
+      #
+      #   filter: [Regexp|Proc]
+      #     RegExp: Only include log messages where the class name matches the supplied.
+      #     regular expression. All other messages will be ignored.
+      #     Proc: Only include log messages where the supplied Proc returns true
+      #           The Proc must return true or false.
+      def initialize(level: :error, formatter: nil, filter: nil, application: nil, host: nil, &block)
+        raise 'Bugsnag only supports :info, :warn, or :error log levels' unless %i[info warn error fatal].include?(level)
 
-    # Replace the Bugsnag logger so that we can identify its log messages and not forward them to Bugsnag
-    Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] }
+        # Replace the Bugsnag logger so that we can identify its log messages and not forward them to Bugsnag
+        ::Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] }
 
-    super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
-  end
+        super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
+      end
 
-  # Returns [Hash] of parameters to send to Bugsnag.
-  def call(log, logger)
-    h            = SemanticLogger::Formatters::Raw.new.call(log, logger)
-    h[:severity] = log_level(log)
-    h.delete(:message) if h[:exception] && (h[:message] == h[:exception][:message])
-    h.delete(:time)
-    h.delete(:exception)
-    h
-  end
+      # Returns [Hash] of parameters to send to Bugsnag.
+      def call(log, logger)
+        h            = SemanticLogger::Formatters::Raw.new.call(log, logger)
+        h[:severity] = log_level(log)
+        h.delete(:message) if h[:exception] && (h[:message] == h[:exception][:message])
+        h.delete(:time)
+        h.delete(:exception)
+        h
+      end
 
-  # Send an error notification to Bugsnag
-  def log(log)
-    # Ignore logs coming from Bugsnag itself
-    return false if log.name == 'Bugsnag'
+      # Send an error notification to Bugsnag
+      def log(log)
+        # Ignore logs coming from Bugsnag itself
+        return false if log.name == 'Bugsnag'
 
-    # Send error messages as Runtime exceptions
-    exception =
-      if log.exception
-        # Manually constructed Exception, without a backtrace.
-        log.exception.set_backtrace(log.backtrace) if !log.exception.backtrace && log.backtrace
-        log.exception
-      else
-        error = RuntimeError.new(log.message)
-        error.set_backtrace(log.backtrace) if log.backtrace
-        error
-      end
+        # Send error messages as Runtime exceptions
+        exception =
+          if log.exception
+            # Manually constructed Exception, without a backtrace.
+            log.exception.set_backtrace(log.backtrace) if !log.exception.backtrace && log.backtrace
+            log.exception
+          else
+            error = RuntimeError.new(log.message)
+            error.set_backtrace(log.backtrace) if log.backtrace
+            error
+          end
 
-    # For more documentation on the Bugsnag.notify method see:
-    # https://bugsnag.com/docs/notifiers/ruby#sending-handled-exceptions
-    Bugsnag.notify(exception, formatter.call(log, self))
-    true
-  end
+        # For more documentation on the Bugsnag.notify method see:
+        # https://bugsnag.com/docs/notifiers/ruby#sending-handled-exceptions
+        ::Bugsnag.notify(exception, formatter.call(log, self))
+        true
+      end
 
-  private
+      private
 
-  # Bugsnag supports: error, warning or info
-  def log_level(log)
-    case log.level
-    when :error, :fatal
-      'error'
-    when :warn
-      'warning'
-    else
-      'info'
+      # Bugsnag supports: error, warning or info
+      def log_level(log)
+        case log.level
+        when :error, :fatal
+          'error'
+        when :warn
+          'warning'
+        else
+          'info'
+        end
+      end
     end
   end
 end

data/lib/semantic_logger/appender/elasticsearch.rb

@@ -14,174 +14,171 @@ require 'date'
 #     appender: :elasticsearch,
 #     url:      'http://localhost:9200'
 #   )
-class SemanticLogger::Appender::Elasticsearch < SemanticLogger::Subscriber
-  attr_accessor :url, :index, :type, :client, :flush_interval, :timeout_interval, :batch_size, :elasticsearch_args
+module SemanticLogger
+  module Appender
+    class Elasticsearch < SemanticLogger::Subscriber
+      attr_accessor :url, :index, :type, :client, :flush_interval, :timeout_interval, :batch_size, :elasticsearch_args
 
-  # Create Elasticsearch appender over persistent HTTP(S)
-  #
-  # Parameters:
-  #   index: [String]
-  #     Prefix of the index to store the logs in Elasticsearch.
-  #     The final index appends the date so that indexes are used per day.
-  #       I.e. The final index will look like 'semantic_logger-YYYY.MM.DD'
-  #     Default: 'semantic_logger'
-  #
-  #   type: [String]
-  #     Document type to associate with logs when they are written.
-  #     Default: 'log'
-  #
-  #   level: [:trace | :debug | :info | :warn | :error | :fatal]
-  #     Override the log level for this appender.
-  #     Default: SemanticLogger.default_level
-  #
-  #   formatter: [Object|Proc|Symbol|Hash]
-  #     An instance of a class that implements #call, or a Proc to be used to format
-  #     the output from this appender
-  #     Default: :raw_json (See: #call)
-  #
-  #   filter: [Regexp|Proc]
-  #     RegExp: Only include log messages where the class name matches the supplied.
-  #     regular expression. All other messages will be ignored.
-  #     Proc: Only include log messages where the supplied Proc returns true
-  #           The Proc must return true or false.
-  #
-  #   host: [String]
-  #     Name of this host to appear in log messages.
-  #     Default: SemanticLogger.host
-  #
-  #   application: [String]
-  #     Name of this application to appear in log messages.
-  #     Default: SemanticLogger.application
-  #
-  # Elasticsearch Parameters:
-  #   url: [String]
-  #     Fully qualified address to the Elasticsearch service.
-  #     Default: 'http://localhost:9200'
-  #
-  #   hosts: [String|Hash|Array]
-  #     Single host passed as a String or Hash, or multiple hosts
-  #     passed as an Array; `host` or `url` keys are also valid.
-  #     Note:
-  #       :url above is ignored when supplying this option.
-  #
-  #   resurrect_after [Float]
-  #     After how many seconds a dead connection should be tried again.
-  #
-  #   reload_connections [true|false|Integer]
-  #     Reload connections after X requests.
-  #     Default: false
-  #
-  #   randomize_hosts [true|false]
-  #     Shuffle connections on initialization and reload.
-  #     Default: false
-  #
-  #   sniffer_timeout [Integer]
-  #     Timeout for reloading connections in seconds.
-  #     Default: 1
-  #
-  #   retry_on_failure [true|false|Integer]
-  #     Retry X times when request fails before raising and exception.
-  #     Default: false
-  #
-  #   retry_on_status [Array<Number>]
-  #     Retry when specific status codes are returned.
-  #
-  #   reload_on_failure [true|false]
-  #     Reload connections after failure.
-  #     Default: false
-  #
-  #   request_timeout [Integer]
-  #     The request timeout to be passed to transport in options.
-  #
-  #   adapter [Symbol]
-  #     A specific adapter for Faraday (e.g. `:patron`)
-  #
-  #   transport_options [Hash]
-  #     Options to be passed to the `Faraday::Connection` constructor.
-  #
-  #   transport_class [Constant]
-  #     A specific transport class to use, will be initialized by
-  #     the client and passed hosts and all arguments.
-  #
-  #   transport [Object]
-  #     A specific transport instance.
-  #
-  #   serializer_class [Constant]
-  #     A specific serializer class to use, will be initialized by
-  #     the transport and passed the transport instance.
-  #
-  #   selector [Elasticsearch::Transport::Transport::Connections::Selector::Base]
-  #     An instance of selector strategy derived from `Elasticsearch::Transport::Transport::Connections::Selector::Base`.
-  #
-  #   send_get_body_as [String]
-  #     Specify the HTTP method to use for GET requests with a body.
-  #     Default: 'GET'
-  def initialize(url: 'http://localhost:9200',
-                 index: 'semantic_logger',
-                 type: 'log',
-                 level: nil,
-                 formatter: nil,
-                 filter: nil,
-                 application: nil,
-                 host: nil,
-                 **elasticsearch_args,
-                 &block)
+      # Create Elasticsearch appender over persistent HTTP(S)
+      #
+      # Parameters:
+      #   index: [String]
+      #     Prefix of the index to store the logs in Elasticsearch.
+      #     The final index appends the date so that indexes are used per day.
+      #       I.e. The final index will look like 'semantic_logger-YYYY.MM.DD'
+      #     Default: 'semantic_logger'
+      #
+      #   type: [String]
+      #     Document type to associate with logs when they are written.
+      #     Default: 'log'
+      #
+      #   level: [:trace | :debug | :info | :warn | :error | :fatal]
+      #     Override the log level for this appender.
+      #     Default: SemanticLogger.default_level
+      #
+      #   formatter: [Object|Proc|Symbol|Hash]
+      #     An instance of a class that implements #call, or a Proc to be used to format
+      #     the output from this appender
+      #     Default: :raw_json (See: #call)
+      #
+      #   filter: [Regexp|Proc]
+      #     RegExp: Only include log messages where the class name matches the supplied.
+      #     regular expression. All other messages will be ignored.
+      #     Proc: Only include log messages where the supplied Proc returns true
+      #           The Proc must return true or false.
+      #
+      #   host: [String]
+      #     Name of this host to appear in log messages.
+      #     Default: SemanticLogger.host
+      #
+      #   application: [String]
+      #     Name of this application to appear in log messages.
+      #     Default: SemanticLogger.application
+      #
+      # Elasticsearch Parameters:
+      #   url: [String]
+      #     Fully qualified address to the Elasticsearch service.
+      #     Default: 'http://localhost:9200'
+      #
+      #   hosts: [String|Hash|Array]
+      #     Single host passed as a String or Hash, or multiple hosts
+      #     passed as an Array; `host` or `url` keys are also valid.
+      #     Note:
+      #       :url above is ignored when supplying this option.
+      #
+      #   resurrect_after [Float]
+      #     After how many seconds a dead connection should be tried again.
+      #
+      #   reload_connections [true|false|Integer]
+      #     Reload connections after X requests.
+      #     Default: false
+      #
+      #   randomize_hosts [true|false]
+      #     Shuffle connections on initialization and reload.
+      #     Default: false
+      #
+      #   sniffer_timeout [Integer]
+      #     Timeout for reloading connections in seconds.
+      #     Default: 1
+      #
+      #   retry_on_failure [true|false|Integer]
+      #     Retry X times when request fails before raising and exception.
+      #     Default: false
+      #
+      #   retry_on_status [Array<Number>]
+      #     Retry when specific status codes are returned.
+      #
+      #   reload_on_failure [true|false]
+      #     Reload connections after failure.
+      #     Default: false
+      #
+      #   request_timeout [Integer]
+      #     The request timeout to be passed to transport in options.
+      #
+      #   adapter [Symbol]
+      #     A specific adapter for Faraday (e.g. `:patron`)
+      #
+      #   transport_options [Hash]
+      #     Options to be passed to the `Faraday::Connection` constructor.
+      #
+      #   transport_class [Constant]
+      #     A specific transport class to use, will be initialized by
+      #     the client and passed hosts and all arguments.
+      #
+      #   transport [Object]
+      #     A specific transport instance.
+      #
+      #   serializer_class [Constant]
+      #     A specific serializer class to use, will be initialized by
+      #     the transport and passed the transport instance.
+      #
+      #   selector [Elasticsearch::Transport::Transport::Connections::Selector::Base]
+      #     An instance of selector strategy derived from `Elasticsearch::Transport::Transport::Connections::Selector::Base`.
+      #
+      #   send_get_body_as [String]
+      #     Specify the HTTP method to use for GET requests with a body.
+      #     Default: 'GET'
+      def initialize(url: 'http://localhost:9200',
+                     index: 'semantic_logger',
+                     type: 'log',
+                     level: nil,
+                     formatter: nil,
+                     filter: nil,
+                     application: nil,
+                     host: nil,
+                     **elasticsearch_args,
+                     &block)
 
-    @url                         = url
-    @index                       = index
-    @type                        = type
-    @elasticsearch_args          = elasticsearch_args.dup
-    @elasticsearch_args[:url]    = url if url && !elasticsearch_args[:hosts]
-    @elasticsearch_args[:logger] = logger
+        @url                         = url
+        @index                       = index
+        @type                        = type
+        @elasticsearch_args          = elasticsearch_args.dup
+        @elasticsearch_args[:url]    = url if url && !elasticsearch_args[:hosts]
+        @elasticsearch_args[:logger] = logger
 
-    super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
-    reopen
-  end
+        super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
+        reopen
+      end
 
-  def reopen
-    @client = Elasticsearch::Client.new(@elasticsearch_args)
-  end
+      def reopen
+        @client = ::Elasticsearch::Client.new(@elasticsearch_args)
+      end
 
-  # Log to the index for today
-  def log(log)
-    bulk_payload = formatter.call(log, self)
-    write_to_elasticsearch([bulk_index(log), bulk_payload])
-    true
-  end
+      # Log to the index for today
+      def log(log)
+        bulk_payload = formatter.call(log, self)
+        write_to_elasticsearch([bulk_index(log), bulk_payload])
+        true
+      end
+
+      def batch(logs)
+        messages = []
+        logs.each do |log|
+          messages << bulk_index(log) << formatter.call(log, self)
+        end
 
-  def batch(logs)
-    messages = []
-    day      = nil
-    logs.each do |log|
-      # Only write the bulk index once per day per batch. Supports mixed dates in a batch.
-      if log.time.day != day
-        messages << bulk_index(log)
-        day = log.time.day
+        write_to_elasticsearch(messages)
+        true
       end
-      messages << formatter.call(log, self)
-    end
 
-    write_to_elasticsearch(messages)
-    true
-  end
+      private
 
-  private
+      def write_to_elasticsearch(messages)
+        bulk_result = @client.bulk(body: messages)
+        return unless bulk_result['errors']
 
-  def write_to_elasticsearch(messages)
-    bulk_result = @client.bulk(body: messages)
-    if bulk_result["errors"]
-      failed = bulk_result["items"].select { |x| x["status"] != 201 }
-      logger.error("ElasticSearch: Write failed. Messages discarded. : #{failed}")
-    end
-  end
+        failed = bulk_result['items'].reject { |x| x['status'] == 201 }
+        logger.error("ElasticSearch: Write failed. Messages discarded. : #{failed}")
+      end
 
-  def bulk_index(log)
-    daily_index = log.time.strftime("#{index}-%Y.%m.%d")
-    {'index' => {'_index' => daily_index, '_type' => type}}
-  end
+      def bulk_index(log)
+        daily_index = log.time.strftime("#{index}-%Y.%m.%d")
+        {'index' => {'_index' => daily_index, '_type' => type}}
+      end
 
-  def default_formatter
-    SemanticLogger::Formatters::Raw.new(time_format: :iso_8601, time_key: :timestamp)
+      def default_formatter
+        SemanticLogger::Formatters::Raw.new(time_format: :iso_8601, time_key: :timestamp)
+      end
+    end
   end
-
 end