semantic_logger 4.2.0 → 4.2.1

data/lib/semantic_logger/appender/mongodb.rb

@@ -103,7 +103,7 @@ module SemanticLogger
       #   application: [String]
       #     Name of this application to appear in log messages.
       #     Default: SemanticLogger.application
-      def initialize(uri:, collection_name: 'semantic_logger', write_concern: 0, collection_size: 1024**3, collection_max: nil,
+      def initialize(uri:, collection_name: 'semantic_logger', write_concern: 0, collection_size: 1024 ** 3, collection_max: nil,
                      level: nil, formatter: nil, filter: nil, host: nil, application: nil, &block)
 
         @client          = Mongo::Client.new(uri, logger: logger)
@@ -144,10 +144,10 @@ module SemanticLogger
         begin
           @collection.create
         rescue Mongo::Error::OperationFailure
-          # Already exists
+          nil
         end
 
-        @collection.indexes.create_one({tags: 1})
+        @collection.indexes.create_one(tags: 1)
       end
 
       # Purge all data from the capped collection by dropping the collection

data/lib/semantic_logger/appender/new_relic.rb

@@ -11,58 +11,61 @@ end
 #
 # Example:
 #   SemanticLogger.add_appender(appender: :new_relic)
-class SemanticLogger::Appender::NewRelic < SemanticLogger::Subscriber
-  # Create 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)
+module SemanticLogger
+  module Appender
+    class NewRelic < SemanticLogger::Subscriber
+      # Create 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)
 
-    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 New Relic.
-  def call(log, logger)
-    h = SemanticLogger::Formatters::Raw.new.call(log, logger)
-    h.delete(:time)
-    h.delete(:exception)
-    {metric: log.metric, custom_params: h}
-  end
+      # Returns [Hash] of parameters to send to New Relic.
+      def call(log, logger)
+        h = SemanticLogger::Formatters::Raw.new.call(log, logger)
+        h.delete(:time)
+        h.delete(:exception)
+        {metric: log.metric, custom_params: h}
+      end
 
-  # Send an error notification to New Relic
-  def log(log)
-    # Send error messages as Runtime exceptions
-    exception =
-      if log.exception
-        log.exception
-      else
-        error = RuntimeError.new(log.message)
-        error.set_backtrace(log.backtrace) if log.backtrace
-        error
+      # Send an error notification to New Relic
+      def log(log)
+        # Send error messages as Runtime exceptions
+        exception =
+          if log.exception
+            log.exception
+          else
+            error = RuntimeError.new(log.message)
+            error.set_backtrace(log.backtrace) if log.backtrace
+            error
+          end
+        # For more documentation on the NewRelic::Agent.notice_error method see:
+        # http://rubydoc.info/github/newrelic/rpm/NewRelic/Agent#notice_error-instance_method
+        # and https://docs.newrelic.com/docs/ruby/ruby-agent-api
+        ::NewRelic::Agent.notice_error(exception, formatter.call(log, self))
+        true
       end
-    # For more documentation on the NewRelic::Agent.notice_error method see:
-    # http://rubydoc.info/github/newrelic/rpm/NewRelic/Agent#notice_error-instance_method
-    # and https://docs.newrelic.com/docs/ruby/ruby-agent-api
-    NewRelic::Agent.notice_error(exception, formatter.call(log, self))
-    true
+    end
   end
-
 end

data/lib/semantic_logger/appender/sentry.rb

@@ -9,63 +9,68 @@ end
 # Example:
 #   SemanticLogger.add_appender(appender: :sentry)
 #
-class SemanticLogger::Appender::Sentry < SemanticLogger::Subscriber
-  # Create Appender
-  #
-  # Parameters
-  #   level: [:trace | :debug | :info | :warn | :error | :fatal]
-  #     Override the log level for this appender.
-  #     Default: :error
-  #
-  #   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: 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.
-  #
-  #   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
-  def initialize(level: :error, formatter: nil, filter: nil, application: nil, host: nil, &block)
-    # Replace the Sentry Raven logger so that we can identify its log messages and not forward them to Sentry
-    Raven.configure { |config| config.logger = SemanticLogger[Raven] }
-    super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
-  end
+module SemanticLogger
+  module Appender
+    class Sentry < SemanticLogger::Subscriber
+      # Create Appender
+      #
+      # Parameters
+      #   level: [:trace | :debug | :info | :warn | :error | :fatal]
+      #     Override the log level for this appender.
+      #     Default: :error
+      #
+      #   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: 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.
+      #
+      #   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
+      def initialize(level: :error, formatter: nil, filter: nil, application: nil, host: nil, &block)
+        # Replace the Sentry Raven logger so that we can identify its log messages and not forward them to Sentry
+        Raven.configure { |config| config.logger = SemanticLogger[Raven] }
+        super(level: level, formatter: formatter, filter: filter, application: application, host: host, &block)
+      end
 
-  # Send an error notification to sentry
-  def log(log)
-    # Ignore logs coming from Raven itself
-    return false if log.name == 'Raven'
+      # Send an error notification to sentry
+      def log(log)
+        # Ignore logs coming from Raven itself
+        return false if log.name == 'Raven'
 
-    context = formatter.call(log, self)
-    attrs                     = {
-      level: context.delete(:level),
-      extra: context
-    }
-    if log.exception
-      context.delete(:exception)
-      Raven.capture_exception(log.exception, attrs)
-    else
-      attrs[:extra][:backtrace] = log.backtrace if log.backtrace
-      Raven.capture_message(context[:message], attrs)
-    end
-    true
-  end
+        context = formatter.call(log, self)
+        attrs   = {
+          level: context.delete(:level),
+          user:  context.delete(:user),
+          tags:  context.delete(:tags),
+          extra: context
+        }
+        if log.exception
+          context.delete(:exception)
+          Raven.capture_exception(log.exception, attrs)
+        else
+          attrs[:extra][:backtrace] = log.backtrace if log.backtrace
+          Raven.capture_message(context[:message], attrs)
+        end
+        true
+      end
 
-  private
+      private
 
-  # Use Raw Formatter by default
-  def default_formatter
-    SemanticLogger::Formatters::Raw.new
+      # Use Raw Formatter by default
+      def default_formatter
+        SemanticLogger::Formatters::Raw.new
+      end
+    end
   end
-
 end

data/lib/semantic_logger/appender/splunk.rb

@@ -18,114 +18,119 @@ end
 #     scheme:   :https,
 #     index:    'main'
 #   )
-class SemanticLogger::Appender::Splunk < SemanticLogger::Subscriber
-  attr_reader :config, :index, :service, :service_index, :source_type
+module SemanticLogger
+  module Appender
+    class Splunk < SemanticLogger::Subscriber
+      attr_reader :config, :index, :service, :service_index, :source_type
 
-  # Write to Splunk.
-  #
-  # Parameters
-  #   :username [String]
-  #     User name to log into splunk with.
-  #     Not required if :token has been supplied.
-  #
-  #   :password [String]
-  #     Password to log into splunk with.
-  #     Not required if :token has been supplied.
-  #
-  #   :token
-  #     Supply a preauthenticated Splunk token instead of username and password.
-  #     Not required if username and password are supplied.
-  #
-  #   :host [String]
-  #      Splunk server host name.
-  #      Default: 'localhost'
-  #
-  #   :port [Integer]
-  #      The Splunk management port.
-  #      Default: 8089
-  #
-  #   :scheme [Symbol]
-  #     Either :https or :http
-  #     Default: :https
-  #
-  #   :index [String]
-  #      Splunk index to use.
-  #      Default: 'main'
-  #
-  #   :namespace [Namespace]
-  #      Application namespace instance.
-  #
-  #   :ssl_client_cert [OpenSSL::X509::Certificate]
-  #     Client certificate.
-  #
-  #   :ssl_client_key [OpenSSL::PKey::RSA | OpenSSL::PKey::DSA]
-  #     Client key.
-  #
-  #   source_type: [String]
-  #     Optional: Source type to display in Splunk
-  #
-  #   application: [String]
-  #     The :source forwarded to Splunk
-  #     Default: SemanticLogger.application
-  #
-  #   host: [String]
-  #     Name of this host to appear in log messages.
-  #     Default: SemanticLogger.host
-  #
-  #   level: [:trace | :debug | :info | :warn | :error | :fatal]
-  #     Override the log level for this appender.
-  #     Default: SemanticLogger.default_level
-  #
-  #   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(index: 'main', source_type: nil, level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
-    @index       = index
-    @source_type = source_type
+      # Write to Splunk.
+      #
+      # Parameters
+      #   :username [String]
+      #     User name to log into splunk with.
+      #     Not required if :token has been supplied.
+      #
+      #   :password [String]
+      #     Password to log into splunk with.
+      #     Not required if :token has been supplied.
+      #
+      #   :token
+      #     Supply a preauthenticated Splunk token instead of username and password.
+      #     Not required if username and password are supplied.
+      #
+      #   :host [String]
+      #      Splunk server host name.
+      #      Default: 'localhost'
+      #
+      #   :port [Integer]
+      #      The Splunk management port.
+      #      Default: 8089
+      #
+      #   :scheme [Symbol]
+      #     Either :https or :http
+      #     Default: :https
+      #
+      #   :index [String]
+      #      Splunk index to use.
+      #      Default: 'main'
+      #
+      #   :namespace [Namespace]
+      #      Application namespace instance.
+      #
+      #   :ssl_client_cert [OpenSSL::X509::Certificate]
+      #     Client certificate.
+      #
+      #   :ssl_client_key [OpenSSL::PKey::RSA | OpenSSL::PKey::DSA]
+      #     Client key.
+      #
+      #   source_type: [String]
+      #     Optional: Source type to display in Splunk
+      #
+      #   application: [String]
+      #     The :source forwarded to Splunk
+      #     Default: SemanticLogger.application
+      #
+      #   host: [String]
+      #     Name of this host to appear in log messages.
+      #     Default: SemanticLogger.host
+      #
+      #   level: [:trace | :debug | :info | :warn | :error | :fatal]
+      #     Override the log level for this appender.
+      #     Default: SemanticLogger.default_level
+      #
+      #   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(index: 'main', source_type: nil,
+                     level: nil, formatter: nil, filter: nil, application: nil, host: nil, &block)
+        @index       = index
+        @source_type = source_type
 
-    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
 
-  # After forking an active process call #reopen to re-open
-  # open the handles to resources
-  def reopen
-    # Connect to splunk. Connect is a synonym for creating a Service by hand and calling login.
-    self.service = Splunk::connect(config)
+      # After forking an active process call #reopen to re-open
+      # open the handles to resources
+      def reopen
+        # Connect to splunk. Connect is a synonym for creating a Service by hand and calling login.
+        self.service = Splunk.connect(config)
 
-    # The index we are logging to
-    self.service_index = service.indexes[index]
-  end
+        # The index we are logging to
+        self.service_index = service.indexes[index]
+      end
 
-  # Log the message to Splunk
-  def log(log)
-    event = formatter.call(log, self)
-    service_index.submit(event.delete(:message), event)
-    true
-  end
+      # Log the message to Splunk
+      def log(log)
+        event = formatter.call(log, self)
+        service_index.submit(event.delete(:message), event)
+        true
+      end
 
-  # Returns [Hash] To send to Splunk.
-  #
-  # For splunk format requirements see:
-  #   http://dev.splunk.com/view/event-collector/SP-CAAAE6P
-  def call(log, logger)
-    h = SemanticLogger::Formatters::Raw.new.call(log, logger)
-    h.delete(:time)
-    message               = {
-      source:  logger.application,
-      host:    logger.host,
-      time:    log.time.utc.to_f,
-      message: h.delete(:message),
-      event:   h
-    }
-    message[:source_type] = source_type if source_type
-    message
+      # Returns [Hash] To send to Splunk.
+      #
+      # For splunk format requirements see:
+      #   http://dev.splunk.com/view/event-collector/SP-CAAAE6P
+      def call(log, logger)
+        h = SemanticLogger::Formatters::Raw.new.call(log, logger)
+        h.delete(:time)
+        message               = {
+          source:  logger.application,
+          host:    logger.host,
+          time:    log.time.utc.to_f,
+          message: h.delete(:message),
+          event:   h
+        }
+        message[:source_type] = source_type if source_type
+        message
+      end
+    end
   end
 end