[Groonga-commit] droonga/droonga-engine at 43c6f58 [master] droonga-engine: remove needless serf.running check

Back to archive index

Kouhei Sutou null+****@clear*****
Mon Jan 5 14:35:17 JST 2015


Kouhei Sutou	2015-01-05 14:35:17 +0900 (Mon, 05 Jan 2015)

  New Revision: 43c6f582831dd2768529b6e592a92a0f8aaa8b02
  https://github.com/droonga/droonga-engine/commit/43c6f582831dd2768529b6e592a92a0f8aaa8b02

  Message:
    droonga-engine: remove needless serf.running check
    
    If we stop serf after we stop catalog observer, serf must be running on
    catalog observer notifies changed event.

  Modified files:
    lib/droonga/command/droonga_engine.rb

  Modified: lib/droonga/command/droonga_engine.rb (+3 -3)
===================================================================
--- lib/droonga/command/droonga_engine.rb    2015-01-05 14:01:59 +0900 (1cd65be)
+++ lib/droonga/command/droonga_engine.rb    2015-01-05 14:35:17 +0900 (c08b774)
@@ -390,15 +390,15 @@ module Droonga
 
         def stop_gracefully
           @command_runner.stop
-          @serf.stop
           @catalog_observer.stop
+          @serf.stop
           @service_runner.stop_gracefully
         end
 
         def stop_immediately
           @command_runner.stop
-          @serf.stop
           @catalog_observer.stop
+          @serf.stop
           @service_runner.stop_immediately
         end
 
@@ -437,7 +437,7 @@ module Droonga
           catalog_observer = FileObserver.new(@loop, Path.catalog)
           catalog_observer.on_change = lambda do
             restart_graceful
-            @serf.update_cluster_id if @serf and****@serf*****?
+            @serf.update_cluster_id
           end
           catalog_observer.start
           catalog_observer
-------------- next part --------------
HTML����������������������������...
Descargar 



More information about the Groonga-commit mailing list
Back to archive index