1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00

Merge pull request #1282 from grosser/grosser/env2

also forget about BUNDLE_GEMFILE etc settings bundler sets up before …
This commit is contained in:
Richard Schneeman 2017-05-09 10:47:10 -05:00 committed by GitHub
commit 54f287472b

View file

@ -163,7 +163,7 @@ module Puma
# Run the server. This blocks until the server is stopped
def run
env = ENV.to_h
previous_env = (defined?(Bundler) ? Bundler.clean_env : ENV.to_h)
@config.clamp
@ -180,7 +180,7 @@ module Puma
graceful_stop
when :restart
log "* Restarting..."
ENV.replace(env)
ENV.replace(previous_env)
@runner.before_restart
restart!
when :exit