droonga/droonga-engine at 06d0026 [master] self: use "stop" instead of "shutdown" (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2014-07-21 18:03:18 +0900 (Mon, 21 Jul 2014)

  New Revision: 06d002695265b563934d92e7b7d0326659e5df99
  https://github.com/droonga/droonga-engine/commit/06d002695265b563934d92e7b7d0326659e5df99

  Message:
    self: use "stop" instead of "shutdown"

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

  Modified: lib/droonga/command/droonga_engine.rb (+4 -4)
===================================================================

--- lib/droonga/command/droonga_engine.rb    2014-07-21 11:30:06 +0900 (f9fae67)
+++ lib/droonga/command/droonga_engine.rb    2014-07-21 18:03:18 +0900 (4c33033)
@@ -257,7 +257,7 @@ module Droonga
 
           trap_signals
           @loop.run
-          @serf.shutdown if****@serf*****?
+          @serf.stop if****@serf*****?
 
           @service_runner.success?
         end
@@ -299,7 +299,7 @@ module Droonga
         def stop_gracefully
           @loop_breaker.signal
           @loop_breaker.detach
-          @serf.shutdown
+          @serf.stop
           @serf_status_observer.stop
           @catalog_observer.stop
           @service_runner.stop_gracefully
@@ -308,7 +308,7 @@ module Droonga
         def stop_immediately
           @loop_breaker.signal
           @loop_breaker.detach
-          @serf.shutdown
+          @serf.stop
           @serf_status_observer.stop
           @catalog_observer.stop
           @service_runner.stop_immediately
@@ -348,7 +348,7 @@ module Droonga
         end
 
         def restart_serf
-          @serf.shutdown if @serf
+          @serf.stop if @serf
           @serf = run_serf
         end
 

  Modified: lib/droonga/serf.rb (+6 -6)
===================================================================
--- lib/droonga/serf.rb    2014-07-21 11:30:06 +0900 (7f8392a)
+++ lib/droonga/serf.rb    2014-07-21 18:03:18 +0900 (616b173)
@@ -99,12 +99,12 @@ module Droonga
       @agent and****@agent*****?
     end
 
-    def shutdown
-      logger.trace("shutdown: start")
-      run("leave").shutdown
-      @agent.shutdown
+    def stop
+      logger.trace("stop: start")
+      run("leave").stop
+      @agent.stop
       @agent = nil
-      logger.trace("shutdown: done")
+      logger.trace("stop: done")
     end
 
     def send_event(event, payload)
@@ -229,7 +229,7 @@ module Droonga
         end
       end
 
-      def shutdown
+      def stop
         return if****@pid*****?
         Process.waitpid(@pid)
         @output_io.close
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-engine at 06d0026 [master] self: use "stop" instead of "shutdown"