lib/spork/server.rb in spork-0.6.1 vs lib/spork/server.rb in spork-0.6.2

@@ -23,10 +23,11 @@
   # Sets up signals and starts the DRb service. If it's successful, it doesn't return. Not ever.  You don't need to override this.
   def listen
     trap("SIGINT") { sig_int_received }
     trap("SIGTERM") { abort; exit!(0) }
     trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")
-    DRb.start_service("druby://127.0.0.1:#{port}", self)
+    @drb_service = DRb.start_service("druby://127.0.0.1:#{port}", self)
+    Spork.each_run { @drb_service.stop_service }
     stderr.puts "Spork is ready and listening on #{port}!"
     stderr.flush
     DRb.thread.join
   end