celluloid 0.6.1 → 0.6.2

data/lib/celluloid.rb

@@ -217,6 +217,7 @@ require 'celluloid/core_ext'
 require 'celluloid/events'
 require 'celluloid/fiber'
 require 'celluloid/links'
+require 'celluloid/logger'
 require 'celluloid/mailbox'
 require 'celluloid/receivers'
 require 'celluloid/registry'

data/lib/celluloid/actor.rb

@@ -152,8 +152,7 @@ module Celluloid
         if fiber
           fiber.resume message
         else
-          warning = "spurious response to call #{message.call_id}"
-          Celluloid.logger.debug if Celluloid.logger
+          Celluloid::Logger.debug("spurious response to call #{message.call_id}")
         end
       else
         @receivers.handle_message(message)
@@ -175,10 +174,10 @@ module Celluloid
 
     # Handle any exceptions that occur within a running actor
     def handle_crash(exception)
-      log_error(exception)
+      Celluloid::Logger.crash("#{@subject.class} crashed!", exception)
       cleanup ExitEvent.new(@proxy, exception)
-    rescue Exception => handler_exception
-      log_error(handler_exception, "ERROR HANDLER CRASHED!")
+    rescue Exception => ex
+      Celluloid::Logger.crash("#{@subject.class}: ERROR HANDLER CRASHED!", ex)
     end
 
     # Handle cleaning up this actor after it exits
@@ -188,16 +187,9 @@ module Celluloid
 
       begin
         @subject.finalize if @subject.respond_to? :finalize
-      rescue Exception => finalizer_exception
-        log_error(finalizer_exception, "#{@subject.class}#finalize crashed!")
+      rescue Exception => ex
+        Celluloid::Logger.crash("#{@subject.class}#finalize crashed!", ex)
       end
     end
-
-    # Log errors when an actor crashes
-    def log_error(ex, message = "#{@subject.class} crashed!")
-      message << "\n#{ex.class}: #{ex.to_s}\n"
-      message << ex.backtrace.join("\n")
-      Celluloid.logger.error message if Celluloid.logger
-    end
   end
 end

data/lib/celluloid/actor_pool.rb

@@ -42,10 +42,7 @@ module Celluloid
                 func.call
               end
             rescue Exception => ex
-              message = "Celluloid::Actor::Pool internal failure:\n"
-              message << "#{ex.class}: #{ex.to_s}\n"
-              message << ex.backtrace.join("\n")
-              Celluloid.logger.error message if Celluloid.logger
+              Celluloid::Logger.crash("#{self} internal failure", ex)
             end
           end
           thread[:queue] = queue

data/lib/celluloid/actor_proxy.rb

@@ -34,8 +34,9 @@ module Celluloid
     end
 
     def inspect
-      "#<Celluloid::Actor(#{@klass}) dead>" unless alive?
       Actor.call @mailbox, :inspect
+    rescue DeadActorError
+      "#<Celluloid::Actor(#{@klass}) dead>"
     end
 
     # Create a Celluloid::Future which calls a given method

data/lib/celluloid/application.rb

@@ -21,7 +21,7 @@ module Celluloid
           # Take five, toplevel supervisor
           sleep 5 while supervisor.alive?
 
-          Celluloid.logger.error "!!! Celluloid::Application #{self} crashed. Restarting..."
+          Celluloid::Logger.error "!!! Celluloid::Application #{self} crashed. Restarting..."
         end
       end
 

data/lib/celluloid/calls.rb

@@ -80,20 +80,14 @@ module Celluloid
       begin
         check_signature(obj)
       rescue Exception => ex
-        log_error ex, "#{obj.class}: async call failed!"
+        Celluloid::Logger.crash("#{obj.class}: async call failed!", ex)
         return
       end
 
       obj.send(@method, *@arguments, &@block)
     rescue AbortError => ex
       # Swallow aborted async calls, as they indicate the caller made a mistake
-      log_error ex, "#{obj.class}: async call aborted!"
-    end
-    
-    def log_error(ex, message)
-      message << "\n#{ex.class}: #{ex.to_s}\n"
-      message << ex.backtrace.join("\n")
-      Celluloid.logger.error message if Celluloid.logger
+      Celluloid::Logger.crash("#{obj.class}: async call aborted!", ex)
     end
   end
 end

data/lib/celluloid/fiber.rb

@@ -54,8 +54,7 @@ module Celluloid
       if result.is_a? Celluloid::Call
         actor.register_fiber result, self
       elsif result
-        warning = "non-call returned from fiber: #{result.class}"
-        Celluloid.logger.debug warning if Celluloid.logger
+        Celluloid::Logger.debug("non-call returned from fiber: #{result.class}")
       end
       nil
     end

data/lib/celluloid/logger.rb

@@ -0,0 +1,27 @@
+module Celluloid
+  module Logger
+    module_function
+
+    # Print a debug message
+    def debug(string)
+      Celluloid.logger.debug(string) if Celluloid.logger
+    end
+
+    # Print a warning message
+    def warn(string)
+      Celluloid.logger.warn(string) if Celluloid.logger
+    end
+
+    # Print an error message
+    def error(string)
+      Celluloid.logger.error(string) if Celluloid.logger
+    end
+
+    # Handle a crash
+    def crash(string, exception)
+      string += "\n#{exception.class}: #{exception.to_s}\n"
+      string << exception.backtrace.join("\n")
+      error(string)
+    end
+  end
+end

data/lib/celluloid/registry.rb

@@ -5,24 +5,29 @@ module Celluloid
   module Registry
     @@registry = {}
     @@registry_lock = Mutex.new
-    
+
     # Register an Actor
     def []=(name, actor)
       actor_singleton = class << actor; self; end
       unless actor_singleton.ancestors.include?(Celluloid::ActorProxy)
         raise ArgumentError, "not an actor"
       end
-      
+
       @@registry_lock.synchronize do
         @@registry[name.to_sym] = actor
       end
     end
-    
+
     # Retrieve an actor by name
     def [](name)
       @@registry_lock.synchronize do
         @@registry[name.to_sym]
       end
     end
+
+    # List all registered actors by name
+    def registered
+      @@registry_lock.synchronize { @@registry.keys }
+    end
   end
-end
+end

data/lib/celluloid/supervisor.rb

@@ -31,11 +31,7 @@ module Celluloid
         if failures >= start_attempts
           failures = 0
 
-          warning = "#{@klass} is crashing on initialize repeatedly, sleeping for #{sleep_interval} seconds\n"
-          warning << "#{ex.class}: #{ex}\n  "
-          warning << "#{ex.backtrace.join("\n  ")}"
-
-          Celluloid.logger.warn warning if Celluloid.logger
+          Celluloid::Logger.crash("#{@klass} is crashing on initialize repeatedly, sleeping for #{sleep_interval} seconds", ex)
           sleep sleep_interval
         end
         retry

data/lib/celluloid/version.rb

@@ -1,4 +1,4 @@
 module Celluloid
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
   def self.version; VERSION; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242345718900 !ruby/object:Gem::Requirement
+  requirement: &70122472224600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242345718900
+  version_requirements: *70122472224600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242345718300 !ruby/object:Gem::Requirement
+  requirement: &70122472224020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70242345718300
+  version_requirements: *70122472224020
 description: Celluloid is a concurrent object framework inspired by the Actor Model
 email:
 - tony@medioh.com
@@ -55,6 +55,7 @@ files:
 - lib/celluloid/io/waker.rb
 - lib/celluloid/io.rb
 - lib/celluloid/links.rb
+- lib/celluloid/logger.rb
 - lib/celluloid/mailbox.rb
 - lib/celluloid/receivers.rb
 - lib/celluloid/registry.rb