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

Ruby: added "require('bundler/setup')".

Browse Source 
This closes #93 PR on GitHub.
This commit is contained in:
Alexander Borisov
2018-07-10 15:43:59 +03:00
parent 1abdcfb2d8
commit a27e76779f
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ruby/nxt_ruby.c
View File

@@ -31,6 +31,7 @@ static nxt_int_t nxt_ruby_init_io(nxt_task_t *task);
static VALUE nxt_ruby_rack_init(nxt_ruby_rack_init_t *rack_init); static VALUE nxt_ruby_rack_init(nxt_ruby_rack_init_t *rack_init);
static VALUE nxt_ruby_require_rubygems(VALUE arg); static VALUE nxt_ruby_require_rubygems(VALUE arg);
static VALUE nxt_ruby_bundler_setup(VALUE arg);
static VALUE nxt_ruby_require_rack(VALUE arg); static VALUE nxt_ruby_require_rack(VALUE arg);
static VALUE nxt_ruby_rack_parse_script(VALUE ctx); static VALUE nxt_ruby_rack_parse_script(VALUE ctx);
static VALUE nxt_ruby_rack_env_create(VALUE arg); static VALUE nxt_ruby_rack_env_create(VALUE arg);
@@ -196,7 +197,7 @@ static VALUE
nxt_ruby_rack_init(nxt_ruby_rack_init_t *rack_init) nxt_ruby_rack_init(nxt_ruby_rack_init_t *rack_init)
{ {
int state; int state;
VALUE rack, rackup; VALUE rack, rackup, err;
rb_protect(nxt_ruby_require_rubygems, Qnil, &state); rb_protect(nxt_ruby_require_rubygems, Qnil, &state);
if (nxt_slow_path(state != 0)) { if (nxt_slow_path(state != 0)) {
@@ -205,6 +206,19 @@ nxt_ruby_rack_init(nxt_ruby_rack_init_t *rack_init)
return Qnil; return Qnil;
} }
rb_protect(nxt_ruby_bundler_setup, Qnil, &state);
if (state != 0) {
err = rb_errinfo();
if (rb_obj_is_kind_of(err, rb_eLoadError) == Qfalse) {
nxt_ruby_exception_log(rack_init->task, NXT_LOG_ALERT,
"Failed to require 'bundler/setup' package");
return Qnil;
}
rb_set_errinfo(Qnil);
}
rb_protect(nxt_ruby_require_rack, Qnil, &state); rb_protect(nxt_ruby_require_rack, Qnil, &state);
if (nxt_slow_path(state != 0)) { if (nxt_slow_path(state != 0)) {
nxt_ruby_exception_log(rack_init->task, NXT_LOG_ALERT, nxt_ruby_exception_log(rack_init->task, NXT_LOG_ALERT,
@@ -240,6 +254,14 @@ nxt_ruby_require_rubygems(VALUE arg)
} }
static VALUE
nxt_ruby_bundler_setup(VALUE arg)
{
return rb_funcall(rb_cObject, rb_intern("require"), 1,
rb_str_new2("bundler/setup"));
}
static VALUE static VALUE
nxt_ruby_require_rack(VALUE arg) nxt_ruby_require_rack(VALUE arg)
{ {