Redefined actor reset behavior.

Author: jdantonio

lib/concurrent/actor/actor_context.rb

@@ -34,6 +34,9 @@ module Concurrent
   # @see http://akka.io/
   # @see http://www.erlang.org/doc/getting_started/conc_prog.html
   # @see http://www.scala-lang.org/api/current/index.html#scala.actors.Actor
+  #
+  # @see http://doc.akka.io/docs/akka/snapshot/general/supervision.html#What_Restarting_Means What Restarting Means
+  # @see http://doc.akka.io/docs/akka/snapshot/general/supervision.html#What_Lifecycle_Monitoring_Means What Lifecycle Monitoring Means
   module ActorContext
 
     # Callback method called by the `ActorRef` which encapsulates the actor instance.

lib/concurrent/actor/simple_actor_ref.rb

@@ -13,8 +13,9 @@ def initialize(actor, opts = {})
       @mutex = Mutex.new
       @executor = SingleThreadExecutor.new
       @stop_event = Event.new
-      @reset_on_error = opts.fetch(:reset_on_error, true)
+      @reset_on_error = opts.fetch(:reset_on_error, false)
       @exception_class = opts.fetch(:rescue_exception, false) ? Exception : StandardError
+      @args = opts.fetch(:args, {})
       self.observers = CopyOnNotifyObserverSet.new
 
       @actor.define_singleton_method(:shutdown, &method(:set_stop_event))
@@ -76,7 +77,9 @@ def process_message(message)
         result = @actor.receive(*message.payload)
       rescue @exception_class => ex
         @actor.on_error(Time.now, message.payload, ex)
-        @actor.on_reset if @reset_on_error
+        if @reset_on_error
+          @mutex.synchronize{ @actor = @actor.class.new(*@args) }
+        end
       ensure
         now = Time.now
         message.ivar.complete(ex.nil?, result, ex)

spec/concurrent/actor/actor_ref_shared.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-def shared_actor_test_class
+def create_actor_test_class
   Class.new do
     include Concurrent::ActorContext
 

spec/concurrent/actor/simple_actor_ref_spec.rb

@@ -11,21 +11,21 @@ module Concurrent
     end
 
     subject do
-      shared_actor_test_class.spawn
+      create_actor_test_class.spawn
     end
 
     it_should_behave_like :actor_ref
 
     context 'construction' do
 
       it 'supports :args being nil' do
-        subject = shared_actor_test_class.spawn
+        subject = create_actor_test_class.spawn
         actor = subject.instance_variable_get(:@actor)
         actor.argv.should be_empty
       end
 
       it 'passes all :args option to the actor constructor' do
-        subject = shared_actor_test_class.spawn(args: [1, 2, 3, 4])
+        subject = create_actor_test_class.spawn(args: [1, 2, 3, 4])
         actor = subject.instance_variable_get(:@actor)
         actor.argv.should eq [1, 2, 3, 4]
       end
@@ -34,44 +34,40 @@ module Concurrent
         subject # prevent the after(:all) block from breaking this test
         opts = {foo: :bar, hello: :world}
         described_class.should_receive(:new).once.with(anything, opts)
-        shared_actor_test_class.spawn(opts)
+        create_actor_test_class.spawn(opts)
       end
 
       it 'calls #on_start on the actor' do
-        actor = double(:shared_actor_test_class)
+        actor = double(:create_actor_test_class)
         actor.should_receive(:on_start).once.with(no_args)
         SimpleActorRef.new(actor)
       end
     end
 
     context 'reset_on_error' do
 
-      after(:each) do
-        @ref.shutdown if @ref
-      end
-
-      it 'causes #on_reset to be called on exception when true' do
-        @ref = shared_actor_test_class.spawn(reset_on_error: true)
-        actor = @ref.instance_variable_get(:@actor)
-        actor.should_receive(:on_reset).once.with(no_args)
-        @ref << :poison
-        sleep(0.1)
+      it 'creates a new actor on exception when true' do
+        clazz = create_actor_test_class
+        args = [:foo, :bar, :hello, :world]
+        ref = clazz.spawn(reset_on_error: true, args: args)
+        clazz.should_receive(:new).once.with(*args)
+        ref.post(:poison)
       end
 
-      it 'prevents #on_reset form being called on exception when false' do
-        @ref = shared_actor_test_class.spawn(reset_on_error: false)
-        actor = @ref.instance_variable_get(:@actor)
-        actor.should_not_receive(:on_reset).with(any_args)
-        @ref << :poison
-        sleep(0.1)
+      it 'does not create a new actor on exception when false' do
+        clazz = create_actor_test_class
+        args = [:foo, :bar, :hello, :world]
+        ref = clazz.spawn(reset_on_error: true, args: args)
+        clazz.should_not_receive(:new).with(any_args)
+        ref.post(:poison)
       end
 
-      it 'defaults to true' do
-        @ref = shared_actor_test_class.spawn
-        actor = @ref.instance_variable_get(:@actor)
-        actor.should_receive(:on_reset).once.with(no_args)
-        @ref << :poison
-        sleep(0.1)
+      it 'defaults to false' do
+        clazz = create_actor_test_class
+        args = [:foo, :bar, :hello, :world]
+        ref = clazz.spawn(args: args)
+        clazz.should_not_receive(:new).with(any_args)
+        ref.post(:poison)
       end
     end
 
@@ -82,7 +78,7 @@ module Concurrent
       end
 
       it 'rescues Exception in the actor thread when true' do
-        @ref = shared_actor_test_class.spawn(
+        @ref = create_actor_test_class.spawn(
           abort_on_exception: false,
           rescue_exception: true
         )
@@ -97,7 +93,7 @@ module Concurrent
       end
 
       it 'rescues StandardError in the actor thread when false' do
-        @ref = shared_actor_test_class.spawn(
+        @ref = create_actor_test_class.spawn(
           abort_on_exception: false,
           rescue_exception: false
         )
@@ -112,7 +108,7 @@ module Concurrent
       end
 
       it 'defaults to false' do
-        @ref = shared_actor_test_class.spawn(abort_on_exception: false)
+        @ref = create_actor_test_class.spawn(abort_on_exception: false)
 
         ivar = @ref.post(:poison)
         sleep(0.1)