Fix NODETACH signals logic.

I had my signals crossed :). Incorrect use of wait.

I have something similar working now in my development environment and it
seems to work with foreman.

lib/thinking_sphinx/tasks.rb

@@ -38,17 +38,12 @@
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
 
     if ENV["NODETACH"] == "true"
-      # https://gist.github.com/994070
-      # Workaround to make Sphinx die nicely:
-      #   - PTY.spawn invokes bash -c under the covers
-      #   - Which turns SIGTERM into SIGHUP (not sure exactly why, can't seem to find a reason)
-      #   - Which sphinx interprets as a reload instead of a quit
-      #   - So, we need to remap HUP to KILL for the purposes of this script.
       unless pid = fork
         config.controller.start(:nodetach => true)
       end
-      trap("SIGHUP") { Process.kill(:TERM, pid) }
-      Process.wait
+      Signal.trap('TERM') { Process.kill(:QUIT, pid) }
+      Signal.trap('INT')  { Process.kill(:QUIT, pid) }
+      Process.wait(pid)
     else
       config.controller.start