Merge pull request #615 from rails/no-sid

rafaelfranca · web-flow · commit 8862501c4986 · 2021-11-23T11:31:24.000-05:00
Remove Sping::SID
diff --git a/lib/spring/env.rb b/lib/spring/env.rb
@@ -2,7 +2,6 @@
 require "digest/md5"
 
 require "spring/version"
-require "spring/sid"
 require "spring/configuration"
 
 module Spring
diff --git a/lib/spring/server.rb b/lib/spring/server.rb
@@ -81,7 +81,8 @@ def rails_env_for(args, default_rails_env)
     # This will cause it to be automatically killed once the session
     # ends (i.e. when the user closes their terminal).
     def set_pgid
-      Process.setpgid(0, SID.pgid)
+      pgid = Process.getpgid(Process.getsid)
+      Process.setpgid(0, pgid)
     end
 
     # Ignore SIGINT and SIGQUIT otherwise the user typing ^C or ^\ on the command line
diff --git a/lib/spring/sid.rb b/lib/spring/sid.rb
diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb
@@ -1,6 +1,5 @@
 require "io/wait"
 require "timeout"
-require "spring/sid"
 require "spring/client"
 require "active_support/core_ext/string/strip"
 
