Navigation Menu

Skip to content

Commit

Permalink
Revert "Restart serf automatically"
Browse files Browse the repository at this point in the history
This reverts commit c143534.

Serf should not be restarted because it breaks graceful restart feature.
  • Loading branch information
kou committed Jun 3, 2014
1 parent d66c8e3 commit d71f565
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
2 changes: 0 additions & 2 deletions lib/droonga/command/droonga_engine.rb
Expand Up @@ -290,7 +290,6 @@ def restart_graceful
old_service_runner = @service_runner
@service_runner = run_service
@service_runner.on_ready = lambda do
@serf.restart if @serf.running?
@service_runner.on_failure = nil
old_service_runner.stop_gracefully
end
Expand All @@ -304,7 +303,6 @@ def restart_immediately
@loop_breaker.signal
old_service_runner = @service_runner
@service_runner = run_service
@serf.restart if @serf.running?
old_service_runner.stop_immediately
end

Expand Down
5 changes: 0 additions & 5 deletions lib/droonga/serf.rb
Expand Up @@ -63,11 +63,6 @@ def shutdown
logger.trace("shutdown: done")
end

def restart
shutdown
start
end

private
def ensure_serf
@serf = find_system_serf
Expand Down

0 comments on commit d71f565

Please sign in to comment.