droonga/droonga-engine at bda0875 [master] Fix broken English (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2014-05-28 10:21:12 +0900 (Wed, 28 May 2014)

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

  Message:
    Fix broken English
    
    Reported by Kenji Okimoto. Thanks!!!

  Modified files:
    lib/droonga/command/droonga_engine.rb
    lib/droonga/command/droonga_engine_service.rb
    lib/droonga/engine.rb
    lib/droonga/server.rb

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

--- lib/droonga/command/droonga_engine.rb    2014-05-28 09:44:24 +0900 (0c9b6bc)
+++ lib/droonga/command/droonga_engine.rb    2014-05-28 10:21:12 +0900 (d5ea9b9)
@@ -239,7 +239,7 @@ module Droonga
         private
         def trap_signals
           trap(:TERM) do
-            stop_graceful
+            stop_gracefully
             trap(:TERM, "DEFAULT")
           end
           trap(:INT) do
@@ -258,11 +258,11 @@ module Droonga
           end
         end
 
-        def stop_graceful
+        def stop_gracefully
           @loop_breaker.signal
           @loop_breaker.detach
           @serf.shutdown
-          @service_runner.stop_graceful
+          @service_runner.stop_gracefully
         end
 
         def stop_immediately
@@ -277,7 +277,7 @@ module Droonga
           old_service_runner = @service_runner
           @service_runner = run_service
           @service_runner.on_ready = lambda do
-            old_service_runner.stop_graceful
+            old_service_runner.stop_gracefully
           end
         end
 
@@ -347,7 +347,7 @@ module Droonga
           attach_control_read_in(control_read_in)
         end
 
-        def stop_graceful
+        def stop_gracefully
           @control_write_out.write(Messages::STOP_GRACEFUL)
         end
 

  Modified: lib/droonga/command/droonga_engine_service.rb (+4 -4)
===================================================================
--- lib/droonga/command/droonga_engine_service.rb    2014-05-28 09:44:24 +0900 (661b455)
+++ lib/droonga/command/droonga_engine_service.rb    2014-05-28 10:21:12 +0900 (e7f5766)
@@ -164,7 +164,7 @@ module Droonga
           data.each_line do |line|
             case line
             when Messages::STOP_GRACEFUL
-              stop_graceful
+              stop_gracefully
             when Messages::STOP_IMMEDIATELY
               stop_immediately
             end
@@ -244,17 +244,17 @@ module Droonga
         @engine.process(message)
       end
 
-      def stop_graceful
+      def stop_gracefully
         return if @stopping
         @stopping = true
         shutdown_receiver
-        @engine.stop_graceful do
+        @engine.stop_gracefully do
           shutdown_control_io
           shutdown_internal_message_receiver
         end
       end
 
-      # It may be called after stop_graceful.
+      # It may be called after stop_gracefully.
       def stop_immediately
         shutdown_control_io
         shutdown_receiver if @receiver

  Modified: lib/droonga/engine.rb (+4 -4)
===================================================================
--- lib/droonga/engine.rb    2014-05-28 09:44:24 +0900 (6d700d0)
+++ lib/droonga/engine.rb    2014-05-28 10:21:12 +0900 (00fee6d)
@@ -59,8 +59,8 @@ module Droonga
       logger.trace("start: done")
     end
 
-    def stop_graceful
-      logger.trace("stop_graceful: start")
+    def stop_gracefully
+      logger.trace("stop_gracefully: start")
       @catalog_observer.stop
       @live_nodes_list_observer.stop
       on_finish = lambda do
@@ -74,10 +74,10 @@ module Droonga
       else
         on_finish.call
       end
-      logger.trace("stop_graceful: done")
+      logger.trace("stop_gracefully: done")
     end
 
-    # It may be called after stop_graceful.
+    # It may be called after stop_gracefully.
     def stop_immediately
       logger.trace("stop_immediately: start")
       output_last_processed_timestamp

  Modified: lib/droonga/server.rb (+2 -2)
===================================================================
--- lib/droonga/server.rb    2014-05-28 09:44:24 +0900 (ad64302)
+++ lib/droonga/server.rb    2014-05-28 10:21:12 +0900 (7885299)
@@ -31,9 +31,9 @@ module Droonga
       Droonga.logger.trace("#{log_tag}: after_run: done")
     end
 
-    def stop(stop_graceful)
+    def stop(stop_gracefully)
       Droonga.logger.trace("#{log_tag}: stop: start")
-      super(stop_graceful)
+      super(stop_gracefully)
       Droonga.logger.trace("#{log_tag}: stop: done")
     end
 
-------------- next part --------------
HTML����������������������������...
ダウンロード 


Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-engine at bda0875 [master] Fix broken English