Wait for child processes when shutting down server

Should fix sporadic CI failures

Author: jonleighton

lib/spring/application_manager.rb

@@ -6,6 +6,7 @@ def initialize(app_env)
       @app_env    = app_env
       @spring_env = Env.new
       @mutex      = Mutex.new
+      @state      = :running
     end
 
     def log(message)
@@ -26,6 +27,7 @@ def start
     end
 
     def restart
+      return if @state == :stopping
       start_child(true)
     end
 
@@ -74,7 +76,12 @@ def run(client)
     end
 
     def stop
-      Process.kill('TERM', pid) if pid
+      @state = :stopping
+
+      if pid
+        Process.kill('TERM', pid)
+        Process.wait(pid)
+      end
     end
 
     private

lib/spring/server.rb

@@ -92,13 +92,13 @@ def set_exit_hook
     end
 
     def shutdown
-      @applications.values.each(&:stop)
-
       [env.socket_path, env.pidfile_path].each do |path|
         if path.exist?
           path.unlink rescue nil
         end
       end
+
+      @applications.values.map { |a| Thread.new { a.stop } }.map(&:join)
     end
 
     def write_pidfile