about summary refs log tree commit homepage
path: root/lib/rainbows/thread_timeout.rb
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2018-05-18 06:27:05 +0000
committerEric Wong <e@80x24.org>2019-01-02 21:40:46 +0000
commit229286be544e76771d2a64637b3c692e51cbd878 (patch)
treea29be86e137e4619030fb19cdcaad1b60391c386 /lib/rainbows/thread_timeout.rb
parentde313da55531438b73c8cb54663ce0f8ab880465 (diff)
downloadrainbows-229286be544e76771d2a64637b3c692e51cbd878.tar.gz
Ruby trunk started warning about more mismatched indentations
starting around r62836.
Diffstat (limited to 'lib/rainbows/thread_timeout.rb')
-rw-r--r--lib/rainbows/thread_timeout.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rainbows/thread_timeout.rb b/lib/rainbows/thread_timeout.rb
index 8739d29..bea1631 100644
--- a/lib/rainbows/thread_timeout.rb
+++ b/lib/rainbows/thread_timeout.rb
@@ -134,11 +134,11 @@ class Rainbows::ThreadTimeout
       @lock.synchronize { @active.delete(Thread.current) }
       # Thread#raise no longer possible here
     end
-    rescue ExecutionExpired
-      # If we got here, it's because the watchdog thread raised an exception
-      # here to kill us.  The watchdog uses @active.delete_if with a lock,
-      # so we guaranteed it's
-      [ 408, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, [] ]
+  rescue ExecutionExpired
+    # If we got here, it's because the watchdog thread raised an exception
+    # here to kill us.  The watchdog uses @active.delete_if with a lock,
+    # so we guaranteed it's
+    [ 408, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, [] ]
   end
 
   # The watchdog thread is the one that does the job of killing threads