[Groonga-commit] droonga/droonga-engine at 5e95ff0 [master] Revert "Fix typo"

Back to archive index

YUKI Hiroshi null+****@clear*****
Fri Sep 5 17:51:07 JST 2014


YUKI Hiroshi	2014-09-05 17:51:07 +0900 (Fri, 05 Sep 2014)

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

  Message:
    Revert "Fix typo"
    
    This reverts commit 4ce1e254bf3e90eeb7a85c0b58964884653c277b.
    To step back to the position before I introduce changes to make shutdown processes "yieldable".

  Modified files:
    lib/droonga/command/droonga_engine_service.rb
    lib/droonga/logger.rb
    lib/droonga/supervisor.rb
    lib/droonga/worker_process_agent.rb

  Modified: lib/droonga/command/droonga_engine_service.rb (+0 -3)
===================================================================
--- lib/droonga/command/droonga_engine_service.rb    2014-09-05 17:50:54 +0900 (87a8bb2)
+++ lib/droonga/command/droonga_engine_service.rb    2014-09-05 17:51:07 +0900 (b1def56)
@@ -210,7 +210,6 @@ module Droonga
       end
 
       def stop_gracefully
-        logger.trace("stop_gracefully: start")
         return if @stopping
         @stopping = true
 
@@ -219,8 +218,6 @@ module Droonga
           n_rest_shutdowns -= 1
           if n_rest_shutdowns.zero?
             yield
-            logger.trace("stop_gracefully: done")
-            logger.trace("watchers = #{@loop.watchers.inspect}")
           end
         end
 

  Modified: lib/droonga/logger.rb (+0 -1)
===================================================================
--- lib/droonga/logger.rb    2014-09-05 17:50:54 +0900 (2d9ca79)
+++ lib/droonga/logger.rb    2014-09-05 17:51:07 +0900 (249b139)
@@ -119,7 +119,6 @@ module Droonga
     def log(level, message, data)
       return unless target_level?(level)
       @output.print(build_log_line(level, message, data))
-      @output.flush
     end
 
     def log_backtrace(level, backtrace)

  Modified: lib/droonga/supervisor.rb (+0 -4)
===================================================================
--- lib/droonga/supervisor.rb    2014-09-05 17:50:54 +0900 (e31e92f)
+++ lib/droonga/supervisor.rb    2014-09-05 17:51:07 +0900 (44a52d9)
@@ -29,7 +29,6 @@ module Droonga
     end
 
     def start
-      logger.trace("start: start")
       n_ready_workers = 0
       @worker_runners = @n_workers.times.collect do |i|
         worker_runner = WorkerRunner.new(@loop, i, @config)
@@ -43,7 +42,6 @@ module Droonga
         # TODO: support auto re-run
         worker_runner
       end
-      logger.trace("start: done")
     end
 
     def stop_gracefully
@@ -157,12 +155,10 @@ module Droonga
       end
 
       def on_finish
-        logger.trace("on_finish: start")
         _, status = Process.waitpid2(@pid)
         @success = status.success?
         @supervisor.stop
         on_failure unless success?
-        logger.trace("on_finish: done")
       end
 
       private

  Modified: lib/droonga/worker_process_agent.rb (+1 -1)
===================================================================
--- lib/droonga/worker_process_agent.rb    2014-09-05 17:50:54 +0900 (6c5f0aa)
+++ lib/droonga/worker_process_agent.rb    2014-09-05 17:51:07 +0900 (2f3fc92)
@@ -58,7 +58,7 @@ module Droonga
           output.close
           on_finish.call do
             yield
-          end
+          emd
         end
       else
         on_finish.call
-------------- next part --------------
HTML����������������������������...
Télécharger 



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