daemon_controller 2.0.0 → 3.0.0

data/spec/echo_server.rb

@@ -55,6 +55,9 @@ parser = OptionParser.new do |opts|
   opts.on("--no-daemonize", "Don't daemonize.") do
     options[:daemonize] = false
   end
+  opts.on("--ignore-sigterm", "Ignore SIGTERM.") do
+    options[:ignore_sigterm] = true
+  end
 end
 begin
   parser.parse!
@@ -77,6 +80,12 @@ if options[:log_message1]
   $stdout.flush
 end
 
+if options[:ignore_sigterm]
+  Signal.trap("SIGTERM", "IGNORE")
+end
+
+sleep(options[:wait1])
+
 if ENV["ENV_FILE"]
   options[:env_file] = File.absolute_path(ENV["ENV_FILE"])
 end
@@ -104,7 +113,6 @@ def main(options)
   end
 
   if options[:pid_file]
-    sleep(options[:wait1])
     File.open(options[:pid_file], "w") do |f|
       f.puts(Process.pid)
     end

data/spec/test_helper.rb

@@ -39,33 +39,51 @@ trap("SIGQUIT") do
 end
 
 module TestHelper
+  def new_logger
+    @logger ||= begin
+      @log_stream = StringIO.new
+      logger = Logger.new(@log_stream)
+      logger.level = Logger::DEBUG
+      logger
+    end
+  end
+
+  def print_logs(example)
+    warn "----- LOGS FOR: #{example.full_description} ----"
+    warn @log_stream.string
+    warn "----- END LOGS -----"
+  end
+
   def new_controller(options = {})
-    @start_command = String.new("./spec/run_echo_server -l spec/echo_server.log")
-    if options[:log_message1]
-      @start_command << " --log-message1 #{Shellwords.escape options[:log_message1]}"
+    @start_command = String.new("./spec/run_in_mri_ruby echo_server.rb -l spec/echo_server.log")
+    if (log_message1 = options.delete(:log_message1))
+      @start_command << " --log-message1 #{Shellwords.escape log_message1}"
     end
-    if options[:log_message2]
-      @start_command << " --log-message2 #{Shellwords.escape options[:log_message2]}"
+    if (log_message2 = options.delete(:log_message2))
+      @start_command << " --log-message2 #{Shellwords.escape log_message2}"
     end
-    if options[:wait1]
-      @start_command << " --wait1 #{options[:wait1]}"
+    if (wait1 = options.delete(:wait1))
+      @start_command << " --wait1 #{wait1}"
     end
-    if options[:wait2]
-      @start_command << " --wait2 #{options[:wait2]}"
+    if (wait2 = options.delete(:wait2))
+      @start_command << " --wait2 #{wait2}"
     end
-    if options[:stop_time]
-      @start_command << " --stop-time #{options[:stop_time]}"
+    if (stop_time = options.delete(:stop_time))
+      @start_command << " --stop-time #{stop_time}"
     end
-    if options[:crash_before_bind]
+    if options.delete(:crash_before_bind)
       @start_command << " --crash-before-bind"
     end
-    if options[:crash_signal]
-      @start_command << " --crash-signal #{options[:crash_signal]}"
+    if (crash_signal = options.delete(:crash_signal))
+      @start_command << " --crash-signal #{crash_signal}"
     end
-    if options[:no_daemonize]
+    if options.delete(:no_daemonize)
       @start_command << " --no-daemonize"
     end
-    if !options[:no_write_pid_file]
+    if options.delete(:ignore_sigterm)
+      @start_command << " --ignore-sigterm"
+    end
+    if !options.delete(:no_write_pid_file)
       @start_command << " -P spec/echo_server.pid"
     end
     new_options = {
@@ -75,9 +93,10 @@ module TestHelper
       pid_file: "spec/echo_server.pid",
       log_file: "spec/echo_server.log",
       start_timeout: 30,
-      stop_timeout: 30
+      stop_timeout: 30,
+      logger: new_logger
     }.merge(options)
-    @controller = DaemonController.new(new_options)
+    @controller = DaemonController.new(**new_options)
   end
 
   def ping_echo_server
@@ -87,6 +106,10 @@ module TestHelper
     false
   end
 
+  def monotonic_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+
   def write_file(filename, contents)
     File.write(filename, contents)
   end
@@ -105,8 +128,8 @@ module TestHelper
   end
 
   def eventually(deadline_duration = 1, check_interval = 0.05)
-    deadline = Time.now + deadline_duration
-    while Time.now < deadline
+    deadline = monotonic_time + deadline_duration
+    while monotonic_time < deadline
       if yield
         return
       else
@@ -115,6 +138,29 @@ module TestHelper
     end
     raise "Time limit exceeded"
   end
+
+  def wait_until_pid_file_available
+    eventually(30) do
+      @controller.send(:pid_file_available?)
+    end
+  end
+
+  def find_echo_server_pid
+    process_line = `ps aux`.lines.grep(/echo_server\.rb/).first
+    process_line.split[1].to_i if process_line
+  end
+
+  def kill_and_wait_echo_server
+    pid = find_echo_server_pid
+    if pid
+      Process.kill("SIGTERM", pid)
+      Timeout.timeout(5) do
+        while find_echo_server_pid
+          sleep(0.1)
+        end
+      end
+    end
+  end
 end
 
 # A thread which doesn't execute its block until the

data/spec/unresponsive_daemon.rb

@@ -3,16 +3,10 @@
 
 dir = File.dirname(__FILE__)
 Dir.chdir(File.dirname(dir))
-begin
-  File.open("spec/echo_server.pid", "w") do |f|
-    f.puts(Process.pid)
-  end
-  sleep 30
-rescue SignalException
-  begin
-    File.unlink("spec/echo_server.pid")
-  rescue
-    nil
-  end
-  raise
+
+Signal.trap("SIGTERM", "IGNORE") if ARGV.include?("--ignore-sigterm")
+
+File.open("spec/echo_server.pid", "w") do |f|
+  f.puts(Process.pid)
 end
+sleep 60

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: daemon_controller
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Hongli Lai
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies: []
 description: A library for robust daemon management.
 email: software-signing@phusion.nl
@@ -26,7 +26,6 @@ files:
 - lib/daemon_controller/version.rb
 - spec/daemon_controller_spec.rb
 - spec/echo_server.rb
-- spec/run_echo_server
 - spec/test_helper.rb
 - spec/unresponsive_daemon.rb
 homepage: https://github.com/FooBarWidget/daemon_controller

data/spec/run_echo_server

@@ -1,9 +0,0 @@
-#!/bin/sh
-dir=`dirname "$0"`
-dir=`cd "$dir"; pwd`
-if test "$MRI_RUBY" != ""; then
-	exec $MRI_RUBY "$dir/echo_server.rb" "$@"
-else
-	echo 'In order to run echo_server, you must set the environment variable $MRI_RUBY.' >&2
-	exit 1
-fi