Logger is now in the Concern module.

Author: jdantonio

lib/concurrent/actor.rb

@@ -1,6 +1,5 @@
 require 'concurrent/configuration'
 require 'concurrent/executor/serialized_execution'
-require 'concurrent/logging'
 require 'concurrent/synchronization'
 require 'concurrent/edge/future'
 

lib/concurrent/actor/behaviour/abstract.rb

@@ -1,9 +1,12 @@
+require 'concurrent/concern/logging'
+
 module Concurrent
   module Actor
     module Behaviour
       class Abstract
         include TypeCheck
         include InternalDelegations
+        include Concern::Logging
 
         attr_reader :core, :subsequent
 
@@ -39,7 +42,7 @@ def broadcast(public, event)
         def reject_envelope(envelope)
           envelope.reject! ActorTerminated.new(reference)
           dead_letter_routing << envelope unless envelope.future
-          log Logging::DEBUG, "rejected #{envelope.message} from #{envelope.sender_path}"
+          log DEBUG, "rejected #{envelope.message} from #{envelope.sender_path}"
         end
       end
     end

lib/concurrent/actor/behaviour/sets_results.rb

@@ -14,11 +14,11 @@ def on_envelope(envelope)
           result = pass envelope
           if result != MESSAGE_PROCESSED && !envelope.future.nil?
             envelope.future.success result
-            log Logging::DEBUG, "finished processing of #{envelope.message.inspect}"
+            log DEBUG, "finished processing of #{envelope.message.inspect}"
           end
           nil
         rescue => error
-          log Logging::ERROR, error
+          log ERROR, error
           case error_strategy
           when :terminate!
             terminate!

lib/concurrent/actor/context.rb

@@ -1,3 +1,5 @@
+require 'concurrent/concern/logging'
+
 module Concurrent
   module Actor
 
@@ -22,6 +24,7 @@ module Actor
     class AbstractContext
       include TypeCheck
       include InternalDelegations
+      include Concern::Logging
 
       attr_reader :core
 

lib/concurrent/actor/core.rb

@@ -1,3 +1,4 @@
+require 'concurrent/concern/logging'
 require 'concurrent/executors'
 
 module Concurrent
@@ -11,7 +12,7 @@ module Actor
     #   that would eat up all threads in task pool and deadlock
     class Core < Synchronization::Object
       include TypeCheck
-      include Concurrent::Logging
+      include Concern::Logging
 
       # @!attribute [r] reference
       #   Reference to this actor which can be safely passed around.
@@ -44,7 +45,7 @@ class Core < Synchronization::Object
       # @option opts [CompletableFuture, nil] initialized, if present it'll be set or failed after {Context} initialization
       # @option opts [Reference, nil] parent **private api** parent of the actor (the one spawning )
       # @option opts [Proc, nil] logger a proc accepting (level, progname, message = nil, &block) params,
-      #   can be used to hook actor instance to any logging system, see {Concurrent::Logging}
+      #   can be used to hook actor instance to any logging system, see {Concurrent::Concern::Logging}
       # @param [Proc] block for class instantiation
       def initialize(opts = {}, &block)
         super(&nil)
@@ -127,7 +128,7 @@ def schedule_execution
       end
 
       def broadcast(public, event)
-        log Logging::DEBUG, "event: #{event.inspect} (#{public ? 'public' : 'private'})"
+        log DEBUG, "event: #{event.inspect} (#{public ? 'public' : 'private'})"
         @first_behaviour.on_event(public, event)
       end
 

lib/concurrent/actor/default_dead_letter_handler.rb

@@ -2,7 +2,7 @@ module Concurrent
   module Actor
     class DefaultDeadLetterHandler < RestartingContext
       def on_message(dead_letter)
-        log Logging::INFO, "got dead letter #{dead_letter.inspect}"
+        log INFO, "got dead letter #{dead_letter.inspect}"
       end
     end
   end

lib/concurrent/agent.rb

@@ -1,7 +1,7 @@
 require 'thread'
 require 'concurrent/concern/dereferenceable'
 require 'concurrent/concern/observable'
-require 'concurrent/logging'
+require 'concurrent/concern/logging'
 require 'concurrent/executor/executor'
 require 'concurrent/concern/deprecation'
 
@@ -81,7 +81,7 @@ module Concurrent
   class Agent
     include Concern::Dereferenceable
     include Concern::Observable
-    include Logging
+    include Concern::Logging
     include Concern::Deprecation
 
     attr_reader :timeout, :io_executor, :fast_executor

lib/concurrent/concern/deprecation.rb

@@ -1,11 +1,11 @@
-require 'concurrent/logging'
+require 'concurrent/concern/logging'
 
 module Concurrent
   module Concern
 
     module Deprecation
       # TODO require additional parameter: a version. Display when it'll be removed based on that. Error if not removed.
-      include Logging
+      include Concern::Logging
 
       def deprecated(message, strip = 2)
         caller_line = caller(strip).first

lib/concurrent/concern/logging.rb

@@ -0,0 +1,23 @@
+require 'logger'
+
+module Concurrent
+  module Concern
+
+    # Include where logging is needed
+    module Logging
+      include Logger::Severity
+
+      # Logs through {Configuration#logger}, it can be overridden by setting @logger
+      # @param [Integer] level one of Logger::Severity constants
+      # @param [String] progname e.g. a path of an Actor
+      # @param [String, nil] message when nil block is used to generate the message
+      # @yieldreturn [String] a message
+      def log(level, progname, message = nil, &block)
+        (@logger || Concurrent.global_logger).call level, progname, message, &block
+      rescue => error
+        $stderr.puts "`Concurrent.configuration.logger` failed to log #{[level, progname, message, block]}\n" +
+          "#{error.message} (#{error.class})\n#{error.backtrace.join "\n"}"
+      end
+    end
+  end
+end

lib/concurrent/configuration.rb

@@ -2,12 +2,13 @@
 require 'concurrent/atomics'
 require 'concurrent/errors'
 require 'concurrent/executors'
+require 'concurrent/concern/deprecation'
+require 'concurrent/concern/logging'
 require 'concurrent/utility/at_exit'
 require 'concurrent/utility/processor_counter'
-require 'concurrent/concern/deprecation'
 
 module Concurrent
-  extend Logging
+  extend Concern::Logging
   extend Concern::Deprecation
 
   # Suppresses all output when used for logging.