Shorten

droonga · Apr 14, 2015 · b6f6aa5 · b6f6aa5
1 parent d7b9c4f
commit b6f6aa5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/droonga/client/connection/droonga-protocol/thread.rb b/lib/droonga/client/connection/droonga-protocol/thread.rb
@@ -78,8 +78,9 @@ def subscribe(message, options={}, &block)
             message["from"] = receive_end_point
             send(message, options)
 
+            timeout_seconds = options[:timeout_seconds]
             receive_options = {
-              :timeout => options[:timeout_seconds],
+              :timeout => timeout_seconds,
             }
             start = Time.new
             sync = block.nil?
@@ -89,8 +90,8 @@ def subscribe(message, options={}, &block)
                   receiver.receive(receive_options) do |object|
                     yielder << object
                   end
-                  if receive_options[:timeout] and
-                       Time.new - start > receive_options[:timeout]
+                  if timeout_seconds and
+                       Time.new - start > timeout_seconds
                     break
                   end
                 end
@@ -101,8 +102,8 @@ def subscribe(message, options={}, &block)
                 begin
                   loop do
                     receiver.receive(receive_options, &block)
-                    if receive_options[:timeout] and
-                         Time.new - start > receive_options[:timeout]
+                    if timeout_seconds and
+                         Time.new - start > timeout_seconds
                       break
                     end
                   end