@@ -1,4 +1,5 @@ -== ? release +== 1.2.2 I Find Your Lack of Sauce Disturbing release + * Fix force kill under 1.9 [Alexey Chebotar] * Fix regression when --only option is used w/ --socket. * Add process name 'tag' functionality. Easier to distinguish thin daemons from eachother in process listing [ctcherry] CHANGELOG @@ -108,16 +108,14 @@ module Thin # Send a +signal+ to the process which PID is stored in +pid_file+. def send_signal(signal, pid_file, timeout=60) - if File.file?(pid_file) && pid = File.read(pid_file) - pid = pid.to_i + if pid = read_pid_file(pid_file) Logging.log "Sending #{signal} signal to process #{pid} ... " Process.kill(signal, pid) Timeout.timeout(timeout) do sleep 0.1 while Process.running?(pid) end - Logging.log "" else - puts "Can't stop process, no PID found in #{pid_file}" + Logging.log "Can't stop process, no PID found in #{pid_file}" end rescue Timeout::Error Logging.log "Timeout!" @@ -130,8 +128,21 @@ module Thin end def force_kill(pid_file) - Process.kill("KILL", File.read(pid_file)) rescue nil - File.delete(pid_file) if File.exist?(pid_file) rescue nil + if pid = read_pid_file(pid_file) + Logging.log "Sending KILL signal to process #{pid} ... " + Process.kill("KILL", pid) + File.delete(pid_file) if File.exist?(pid_file) + else + Logging.log "Can't stop process, no PID found in #{pid_file}" + end + end + + def read_pid_file(file) + if File.file?(file) && pid = File.read(file) + pid.to_i + else + nil + end end end lib/thin/daemonizing.rb @@ -6,11 +6,11 @@ module Thin module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') - CODENAME = "Asynctilicious Ultra Supreme".freeze + CODENAME = "I Find Your Lack of Sauce Disturbing".freeze RACK = [1, 0].freeze # Rack protocol version end lib/thin/version.rb 95a060a8898a44bf038c4222eb072c554738d40d macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/b1908c0c38e4b7b253975492abc463cddf631dde b1908c0c38e4b7b253975492abc463cddf631dde 2009-05-21T13:24:06-07:00 2009-05-21T13:24:06-07:00 Fix force kill under 1.9 and name version [#92 state:resolved] 1e7f0225fc673fa6646f9dc1f570e245e2e42722 macournoyer macournoyer@gmail.com