technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ruby: fixed segfault on SIGTERM signal.

Browse Source 
This closes #562 issue on GitHub.
This commit is contained in:
Zhidao HONG
2022-07-28 11:00:15 +08:00
parent 9b4b4925b3
commit 2bd4a45527
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.xml
View File

@@ -81,6 +81,12 @@ force SCRIPT_NAME in Ruby to always be an empty string.
</para> </para>
</change> </change>
<change type="bugfix">
<para>
the ruby application process could crash if it's interrupted by SIGTERM signal.
</para>
</change>
</changes> </changes>

4
src/ruby/nxt_ruby.c
View File

@@ -377,8 +377,8 @@ nxt_ruby_start(nxt_task_t *task, nxt_process_data_t *data)
} }
} }
rc = (intptr_t) rb_thread_call_without_gvl(nxt_ruby_unit_run, unit_ctx, rc = (intptr_t) rb_thread_call_without_gvl2(nxt_ruby_unit_run, unit_ctx,
nxt_ruby_ubf, unit_ctx); nxt_ruby_ubf, unit_ctx);
if (nxt_ruby_hook_procs != Qnil) { if (nxt_ruby_hook_procs != Qnil) {
rb_protect(nxt_ruby_hook_call, nxt_rb_on_thread_shutdown, &state); rb_protect(nxt_ruby_hook_call, nxt_rb_on_thread_shutdown, &state);