Kenji Okimoto
null+****@clear*****
Thu Jun 15 10:28:55 JST 2017
Kenji Okimoto 2017-04-07 12:16:07 +0900 (Fri, 07 Apr 2017) New Revision: 01e49eafe52270bd95af192fc73ce09be80c6bde https://github.com/milter-manager/milter-manager/commit/01e49eafe52270bd95af192fc73ce09be80c6bde Message: binding ruby: Disable auto detection for each detector. Because these detectors can return their own configuration. Modified files: binding/ruby/lib/milter/manager/init-detector.rb binding/ruby/lib/milter/manager/rcng-detector.rb binding/ruby/lib/milter/manager/redhat-detector.rb binding/ruby/lib/milter/manager/redhat-upstart-detector.rb Modified: binding/ruby/lib/milter/manager/init-detector.rb (+8 -0) =================================================================== --- binding/ruby/lib/milter/manager/init-detector.rb 2017-04-07 02:02:43 +0900 (c579287) +++ binding/ruby/lib/milter/manager/init-detector.rb 2017-04-07 12:16:07 +0900 (e7c8632) @@ -32,6 +32,14 @@ module Milter::Manager init_script end + def command + init_script + end + + def command_options + ["start"] + end + def init_script_readable? File.readable?(init_script) end Modified: binding/ruby/lib/milter/manager/rcng-detector.rb (+8 -0) =================================================================== --- binding/ruby/lib/milter/manager/rcng-detector.rb 2017-04-07 02:02:43 +0900 (7b81fd9) +++ binding/ruby/lib/milter/manager/rcng-detector.rb 2017-04-07 12:16:07 +0900 (740a157) @@ -36,6 +36,14 @@ module Milter::Manager rc_script end + def command + run_command + end + + def command_options + ["start"] + end + def detect init_variables return unless rc_script_readable? Modified: binding/ruby/lib/milter/manager/redhat-detector.rb (+12 -0) =================================================================== --- binding/ruby/lib/milter/manager/redhat-detector.rb 2017-04-07 02:02:43 +0900 (a25e4c4) +++ binding/ruby/lib/milter/manager/redhat-detector.rb 2017-04-07 12:16:07 +0900 (75ef71b) @@ -63,6 +63,18 @@ module Milter::Manager @init_detector.enabled? end + def systemd? + @systemd_detector.enabled? + end + + def upstart? + @upstart_detector.enabled? + end + + def sysv_init? + @init_detector.enabled? + end + private def init_variables super Modified: binding/ruby/lib/milter/manager/redhat-upstart-detector.rb (+4 -0) =================================================================== --- binding/ruby/lib/milter/manager/redhat-upstart-detector.rb 2017-04-07 02:02:43 +0900 (3b9dcaa) +++ binding/ruby/lib/milter/manager/redhat-upstart-detector.rb 2017-04-07 12:16:07 +0900 (7ec0897) @@ -30,6 +30,10 @@ module Milter::Manager "/sbin/start" end + def command + run_command + end + def command_options if have_service_command? super -------------- next part -------------- An HTML attachment was scrubbed... 다운로드