1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore EPERM which means already being process-leader

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-09-20 11:12:11 +09:00
parent b4546d26f2
commit 55e540f7ab
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
process.c
View File

@ -7115,7 +7115,8 @@ rb_daemon(int nochdir, int noclose)
default: _exit(EXIT_SUCCESS); default: _exit(EXIT_SUCCESS);
} }
if (setsid() < 0) return -1; /* ignore EPERM which means already being process-leader */
if (setsid() < 0) (void)0;
if (!nochdir) if (!nochdir)
err = chdir("/"); err = chdir("/");

6
test/ruby/test_process.rb
View File

@ -1881,17 +1881,19 @@ class TestProcess < Test::Unit::TestCase
if f if f
assert_equal(f.pid, Process.wait(f.pid)) assert_equal(f.pid, Process.wait(f.pid))
dpid, ppid = Integer(f.gets), Integer(f.gets) dpid, ppid, dsid = 3.times.map {Integer(f.gets)}
message = "daemon #{dpid} should be detached" message = "daemon #{dpid} should be detached"
assert_not_equal($$, ppid, message) # would be 1 almost always assert_not_equal($$, ppid, message) # would be 1 almost always
assert_raise(Errno::ECHILD, message) {Process.wait(dpid)} assert_raise(Errno::ECHILD, message) {Process.wait(dpid)}
assert_kind_of(Integer, Process.kill(0, dpid), message) assert_kind_of(Integer, Process.kill(0, dpid), message)
assert_equal(dpid, dsid)
break # close f, and let the daemon resume and exit break # close f, and let the daemon resume and exit
end end
Process.setsid rescue nil
Process.daemon(false, true) Process.daemon(false, true)
puts $$, Process.ppid puts $$, Process.ppid, Process.getsid
$stdin.gets # wait for the above assertions using signals $stdin.gets # wait for the above assertions using signals
end end
end end