Revert "Fix Thin not obeying to QUIT / TERM signal under Ruby 1.9 [Na…

…te Wiger]" This was already in there ... This reverts commit 99d9ece. Conflicts: CHANGELOG
macournoyer · Feb 11, 2010 · 7d870c8 · 7d870c8
1 parent a094f3a
commit 7d870c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,5 @@
-== 1.2.6
+== 1.2.6 ???
  * Auto-detect and load config.ru files on start. Makes Rails 3 work.
- * Fix Thin not obeying to QUIT / TERM signal under Ruby 1.9 [Nate Wiger] [#123 state:resolved]
 
 == 1.2.5 This Is Not A Web Server
  * Add rolling restart support (--onebyone option) [sikachu]

diff --git a/lib/thin/daemonizing.rb b/lib/thin/daemonizing.rb
@@ -47,10 +47,7 @@ def daemonize
 
       write_pid_file
 
-      trap('HUP')  { restart }
-      trap('TERM') { log ">> Received TERM signal (PID: #{$$})"; exit }
-      trap('QUIT') { log ">> Received QUIT signal (PID: #{$$})"; exit }
-
+      trap('HUP') { restart }
       at_exit do
         log ">> Exiting!"
         remove_pid_file