Skip to content

Add thread safety #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abvgdejg wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add thread safety #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7141303
Run file with process group kill
sh84 Sep 25, 2025
1e5d78c
Run file with process group kill - v2
sh84 Oct 6, 2025
2f3ad19
Add thread safety
Abvgdejg Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 42 additions & 138 deletions lib/daemontools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'daemontools/version'
require 'daemontools/service'
require 'daemontools/service_builder'
require 'daemontools/service_remover'
require 'etc'
Expand All @@ -12,184 +13,87 @@ class << self
@log_root = '/var/log/svc'
@tmp_root = '/tmp'

def self.exists?(name)
check_service_exists(name, false)
end

def self.tmp_exists?(name)
Dir.exists?("#{@tmp_root}/daemontools_service_#{name}")
end
# Actions

def self.status(name)
check_service_exists(name)
r = `sudo svstat #{@path} 2>&1`
raise r if $?.exitstatus != 0
raise "Unknown status" unless r.match(/.*?:\s*(\S+).*\s(\d+) seconds.*/)
[$1, $2.to_i]
def self.add(name, command, options = {})
Service[name].add(command, options)
end

def self.up?(name)
status(name)[0] == "up"
def self.delete(name, rm_cmd = nil)
Service[name].delete(rm_cmd)
end

def self.down?(name)
status(name)[0] == "down"
def self.start(name)
Service[name].start
end

def self.stop(name)
run_svc(name, 'd')
end

def self.start(name)
run_svc(name, 'u')
Service[name].stop
end

def self.restart(name)
run_svc(name, 't')
Service[name].restart
end

def self.add_empty(name)
path = "#{@svc_root}/#{name}"
Dir.mkdir(path) unless Dir.exists?(path)
File.open("#{path}/down", 'w') {|f| f.write('')}
now = Time.now.to_f
while `sudo svstat #{path} 2>&1`.match(/unable to open/i)
raise "Timeout wait for svc add service" if Time.now.to_f - now > 10
sleep 0.1
end
File.delete("#{path}/down")
stop(name)
true
end
# Statuses

def self.add_empty_tmp(name)
path = "#{@tmp_root}/daemontools_service_#{name}"
Dir.mkdir(path) unless Dir.exists?(path)
true
def self.status(name)
Service[name].status
end

def self.move_tmp(name)
tmp_path = "#{@tmp_root}/daemontools_service_#{name}"
svc_path = "#{@svc_root}/#{name}"

r = `mv #{tmp_path} #{svc_path}`
raise r if $?.exitstatus != 0
raise r if ! r.empty?

now = Time.now.to_f
while `sudo svstat #{svc_path} 2>&1`.match(/unable to open/i)
raise "Timeout wait for svc add service" if Time.now.to_f - now > 10
sleep 0.1
end
def self.up?(name)
Service[name].up?
end

true
def self.down?(name)
Service[name].down?
end

def self.add(name, command, options = {})
@name = name
@command = command
@log_dir = options[:log_dir] || "#{@log_root}/#{@name}"
@pre_command = options[:pre_command]
@sleep = options[:sleep] || 3
@path = "#{@svc_root}/#{name}"
@log_path = "#{@path}/log"
@change_user_command = options[:change_user_command]
@ulimit = options[:ulimit]
@write_time = options[:write_time]

if Dir.exists?(@path)
stop(name)
else
Dir.mkdir(@path)
end
File.open("#{@path}/down", 'w') {|f| f.write('')}
Dir.mkdir(@log_path) unless Dir.exists?(@log_path)
File.open("#{@log_path}/down", 'w') {|f| f.write('')}
File.open("#{@log_path}/run", 'w', 0755) {|f| f.write(run_template('log.erb'))}
File.open("#{@path}/run", 'w', 0755) {|f| f.write(run_template('run.erb'))}

unless options[:not_wait]
wait_timeout = options[:wait_timeout] || 10
now = Time.now.to_f
while `sudo svstat #{@path} 2>&1`.match(/unable to open/i)
raise "Timeout wait for svc add service" if Time.now.to_f - now > wait_timeout
sleep 0.1
end
end

true
def self.exists?(name)
Service[name].check_service_exists
end

def self.delete(name, rm_cmd = nil)
return false unless exists?(name)
stop(name)
sleep 0.3
cmd = rm_cmd.nil? ? "sudo rm -rf #{@path} 2>&1" : "#{rm_cmd} #{@path}"
r = `#{cmd}`
raise r if $?.exitstatus != 0
true
def self.check_service_exists(name, raise_error = true)
Service[name].check_service_exists(raise_error)
end

# Run States

def self.run_status(name)
check_service_exists(name)
File.exists?("#{@path}/down") ? "down" : "up"
Service[name].run_status
end

def self.run_status_up?(name)
run_status(name) == "up"
Service[name].run_status_up?
end

def self.run_status_down?(name)
run_status(name) == "down"
Service[name].run_status_down?
end

def self.make_run_status_up(name)
File.delete("#{@path}/down")
File.delete("#{@log_path}/down") if Dir.exists?(@log_path)
true
Service[name].run_status_up!
end

def self.make_run_status_down(name)
check_service_exists(name)
File.open("#{@path}/down", 'w') {|f| f.write('')}
Service[name].run_status_down!
end

if Dir.exists?(@log_path)
File.open("#{@log_path}/down", 'w') { |f| f.write('') }
end
# Tmp Actions

true
def self.add_empty(name)
Service[name].add_empty
end

private
def self.add_empty_tmp(name)
Service[name].add_empty_tmp
end

def self.check_service_exists(name, raise_error = true)
@path = "#{@svc_root}/#{name}"
@log_path = "#{@path}/log"
if raise_error
raise "Service #{name} not exists" unless Dir.exists?(@path)
else
Dir.exists?(@path)
end
end

def self.run_svc(name, command)
check_service_exists(name)
r = `sudo svc -#{command} #{@path} 2>&1`
raise r if $?.exitstatus != 0
raise r if ! r.empty?

if Dir.exists?(@log_path)
r = `sudo svc -#{command} #{@log_path} 2>&1`
raise r if $?.exitstatus != 0
raise r if ! r.empty?
end

true
end

def self.run_template(template_name)
@user = Etc.getpwuid(Process.uid).name
template_path = File.expand_path(File.dirname(__FILE__))+'/../templates/'+template_name
ERB.new(File.read(template_path)).result(binding())
def self.move_tmp(name)
Service[name].move_tmp
end

def self.tmp_exists?(name)
Service[name].tmp_exists?
end
end
Loading