[Groonga-commit] droonga/droonga-engine at 83c30f3 [master] Ignore value for the "daemon" option defined in the configuration file.

Back to archive index

YUKI Hiroshi null+****@clear*****
Wed Nov 5 15:13:20 JST 2014


YUKI Hiroshi	2014-11-05 15:13:20 +0900 (Wed, 05 Nov 2014)

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

  Message:
    Ignore value for the "daemon" option defined in the configuration file.
    
    Behavior around this option should be same to droonga-http-server's one.

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

  Modified: lib/droonga/command/droonga_engine.rb (+1 -6)
===================================================================
--- lib/droonga/command/droonga_engine.rb    2014-11-04 19:24:06 +0900 (d957647)
+++ lib/droonga/command/droonga_engine.rb    2014-11-05 15:13:20 +0900 (9141ba3)
@@ -128,12 +128,7 @@ module Droonga
           @ready_notify_fd = nil
 
           if have_config_file?
-            if config.include?("daemon")
-              @daemon = config["daemon"]
-            end
-            if @daemon
-              self.pid_file_path = config["pid_file"] || Path.default_pid_file
-            end
+            self.pid_file_path = config["pid_file"]
             self.log_file  = config["log_file"] || Path.default_log_file
             self.log_level = config["log_level"] if config.include?("log_level")
           end

  Modified: lib/droonga/path.rb (+0 -4)
===================================================================
--- lib/droonga/path.rb    2014-11-04 19:24:06 +0900 (69c83ad)
+++ lib/droonga/path.rb    2014-11-05 15:13:20 +0900 (2f2cc42)
@@ -58,10 +58,6 @@ module Droonga
         base + "droonga-engine.yaml"
       end
 
-      def default_pid_file
-        base + "droonga-engine.pid"
-      end
-
       def default_log_file
         base + "droonga-engine.log"
       end
-------------- next part --------------
HTML����������������������������...
下載 



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