Set correct ENV during preload

Author: eval

lib/spring/application.rb

@@ -134,18 +134,18 @@ def run
     end
 
     def with_env_vars(env)
-      old_env = ENV.to_hash
-
-      # TODO move env-filtering
       # Delete all env vars which are unchanged from before spring started
       original_env.each { |k, v| ENV.delete k if ENV[k] == v }
 
+      changed_keys = env.keys - ENV.keys
       # Load in the current env vars, except those which *were* changed when spring started
       env.each { |k, v| ENV[k] ||= v }
 
       yield
     ensure
-      ENV.replace(old_env.to_hash)
+      changed_keys.each do |k|
+        original_env.has_key?(k) ? ENV[k] = original_env[k] : ENV.delete(k)
+      end
     end
 
     def serve(client)
@@ -157,6 +157,7 @@ def serve(client)
 
       client_args, client_env = JSON.load(client.read(client.gets.to_i)).values_at("args", "env")
 
+      @pid = nil
       with_env_vars(client_env) do
         preload unless preloaded?
         command = Spring.command(client_args.shift)
@@ -169,7 +170,7 @@ def serve(client)
           ActionDispatch::Reloader.prepare!
         end
 
-        pid = fork {
+        @pid = fork {
           IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
           trap("TERM", "DEFAULT")
 
@@ -197,20 +198,20 @@ def serve(client)
       disconnect_database
       reset_streams
 
-      log "forked #{pid}"
-      manager.puts pid
+      log "forked #{@pid}"
+      manager.puts @pid
 
-      wait pid, streams, client
+      wait @pid, streams, client
     rescue Exception => e
       log "exception: #{e}"
-      manager.puts unless pid
+      manager.puts unless @pid
 
       if streams && !e.is_a?(SystemExit)
         print_exception(stderr, e)
         streams.each(&:close)
       end
 
-      client.puts(1) if pid
+      client.puts(1) if @pid
       client.close
     end
 

test/acceptance/app_test.rb

@@ -292,7 +292,7 @@ def binstub_prelude
   end
 
   test "config via environment variable" do
-    File.write(application.path('config/initializers/set_foo.rb'), <<-CONFIG)
+    File.write(app.path('config/initializers/set_foo.rb'), <<-CONFIG)
       Rails.application.config.foo = !!ENV['FOO']
     CONFIG