Return actually restarted or not

droonga · Apr 21, 2015 · 7938224 · 7938224
1 parent b3192cc
commit 7938224
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/droonga/serf.rb b/lib/droonga/serf.rb
@@ -224,11 +224,17 @@ def cluster_id
     def ensure_restarted(&block)
       start_time = Time.now
       previous_internal_name = get_tag("internal-name")
+      restarted = false
+
       yield # the given operation must restart the service.
-      while Time.now - start_time < CHECK_RESTARTED_TIMEOUT and
-              get_tag("internal-name") == previous_internal_name
+
+      while Time.now - start_time < CHECK_RESTARTED_TIMEOUT
+        restarted = get_tag("internal-name") == previous_internal_name
+        break if restarted
         sleep(CHECK_RESTARTED_INTERVAL)
       end
+
+      restarted
     end
 
     private