Allow to cancel do_cancel processes triggered by signals

droonga · Mar 27, 2015 · de084e0 · de084e0
1 parent 07a005e
commit de084e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/droonga-engine-absorb-data b/bin/droonga-engine-absorb-data
@@ -232,18 +232,18 @@ class AbsorbDataCommand
 
   def trap_signals
     trap(:TERM) do
-      do_cancel
       trap(:TERM, "DEFAULT")
+      do_cancel
     end
 
     trap(:INT) do
-      do_cancel
       trap(:INT, "DEFAULT")
+      do_cancel
     end
 
     trap(:QUIT) do
-      do_cancel
       trap(:QUIT, "DEFAULT")
+      do_cancel
     end
   end
 

diff --git a/bin/droonga-engine-join b/bin/droonga-engine-join
@@ -267,18 +267,18 @@ class JoinCommand
 
   def trap_signals
     trap(:TERM) do
-      do_cancel
       trap(:TERM, "DEFAULT")
+      do_cancel
     end
 
     trap(:INT) do
-      do_cancel
       trap(:INT, "DEFAULT")
+      do_cancel
     end
 
     trap(:QUIT) do
-      do_cancel
       trap(:QUIT, "DEFAULT")
+      do_cancel
     end
   end