diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-27 05:16:18 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-27 05:16:18 +0300 |
| commit | 83ec509ce43c56da601335de5b9ea4422c785560 (patch) | |
| tree | d30252fcc69995abb5b027d852c6325e71aeb02d /config | |
| parent | 57f0677ad854b7b17bd57e1e3b0ef542ce322b56 (diff) | |
| parent | b56db3338168a4fd48de9e87e6014260477368cd (diff) | |
Merge branch 'update_bootsnap_1.1.1' into 'master'
Bump bootsnap to 1.1.1
Closes #34084
See merge request !12425
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/boot.rb b/config/boot.rb index 2d01092acd5..02baeab29ab 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -5,6 +5,12 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +begin + require 'bootsnap/setup' +rescue SystemCallError => exception + $stderr.puts "WARNING: Bootsnap failed to setup: #{exception.message}" +end + # set default directory for multiproces metrics gathering if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test' ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' |