issue #487: extra begin/end for older Ruby versions

guard · Oct 30, 2020 · c23a8e2 · c23a8e2
1 parent 84c0b6b
commit c23a8e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/listen/thread.rb b/lib/listen/thread.rb
@@ -12,10 +12,12 @@ def new(name)
 
         caller_stack = caller
         ::Thread.new do
-          yield
-        rescue Exception => ex
-          _log_exception(ex, thread_name, caller_stack)
-          nil
+          begin
+            yield
+          rescue Exception => ex
+            _log_exception(ex, thread_name, caller_stack)
+            nil
+          end
         end.tap do |thread|
           thread.name = thread_name
         end

diff --git a/spec/lib/listen/thread_spec.rb b/spec/lib/listen/thread_spec.rb
@@ -36,12 +36,14 @@
     let(:block) do
       -> do
         begin
-          raise ArgumentError, 'boom!'
+          begin
+            raise ArgumentError, 'boom!'
+          rescue
+            raise 'nested inner'
+          end
         rescue
-          raise 'nested inner'
+          raise 'nested outer'
         end
-      rescue
-        raise 'nested outer'
       end
     end