Handle Exception children in Edge::Future

ruby-concurrency · Sep 30, 2015 · 2f5af57 · 2f5af57
1 parent 59c8b1e
commit 2f5af57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/concurrent/edge/future.rb b/lib/concurrent/edge/future.rb
@@ -132,6 +132,7 @@ def post_on(executor, *args, &job)
     class Event < Synchronization::LockableObject
       safe_initialization!
       include Concern::Deprecation
+      include Concern::Logging
 
       # @!visibility private
       class State
@@ -885,6 +886,7 @@ def hide_completable
     # @!visibility private
     class AbstractPromise < Synchronization::Object
       safe_initialization!
+      include Concern::Logging
 
       def initialize(future)
         super()
@@ -928,8 +930,8 @@ def evaluate_to(*args, block)
       rescue StandardError => error
         complete_with Future::Failed.new(error)
       rescue Exception => error
+        log(ERROR, 'Edge::Future', error)
         complete_with Future::Failed.new(error)
-        raise error
       end
     end
 

diff --git a/spec/concurrent/edge/future_spec.rb b/spec/concurrent/edge/future_spec.rb
@@ -337,7 +337,7 @@
 
     it 'completes future when Exception raised' do
       f = Concurrent.future { raise Exception, 'fail' }
-      sleep 0.2
+      f.wait 1
       expect(f).to be_completed
       expect(f).to be_failed
       expect{ f.value! }.to raise_error(Exception, 'fail')