Kouhei Sutou
null+****@clear*****
Tue Jun 3 11:34:35 JST 2014
Kouhei Sutou 2014-06-03 11:34:35 +0900 (Tue, 03 Jun 2014) New Revision: d71f5654301bd26cea451a4efe766557f7128b13 https://github.com/droonga/droonga-engine/commit/d71f5654301bd26cea451a4efe766557f7128b13 Message: Revert "Restart serf automatically" This reverts commit c143534b6191442a372fa80994a7712639bffeb4. Serf should not be restarted because it breaks graceful restart feature. Modified files: lib/droonga/command/droonga_engine.rb lib/droonga/serf.rb Modified: lib/droonga/command/droonga_engine.rb (+0 -2) =================================================================== --- lib/droonga/command/droonga_engine.rb 2014-05-29 22:27:09 +0900 (c271c78) +++ lib/droonga/command/droonga_engine.rb 2014-06-03 11:34:35 +0900 (6ead147) @@ -290,7 +290,6 @@ module Droonga old_service_runner = @service_runner @service_runner = run_service @service_runner.on_ready = lambda do - @serf.restart if****@serf*****? @service_runner.on_failure = nil old_service_runner.stop_gracefully end @@ -304,7 +303,6 @@ module Droonga @loop_breaker.signal old_service_runner = @service_runner @service_runner = run_service - @serf.restart if****@serf*****? old_service_runner.stop_immediately end Modified: lib/droonga/serf.rb (+0 -5) =================================================================== --- lib/droonga/serf.rb 2014-05-29 22:27:09 +0900 (699d9ff) +++ lib/droonga/serf.rb 2014-06-03 11:34:35 +0900 (6ed72ee) @@ -63,11 +63,6 @@ module Droonga logger.trace("shutdown: done") end - def restart - shutdown - start - end - private def ensure_serf @serf = find_system_serf -------------- next part -------------- HTML����������������������������...下载
