From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 27 Dec 2013 10:35:05 +0000 (+0200)
Subject: Handle signals better
X-Git-Tag: rec-3.6.0-rc1~266^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eafcdfbdc03d3cc62352bda20d736445eed4e70;p=pdns

Handle signals better
---

diff --git a/modules/remotebackend/unittest_zeromq.rb b/modules/remotebackend/unittest_zeromq.rb
index 11b825d98..be8569d92 100755
--- a/modules/remotebackend/unittest_zeromq.rb
+++ b/modules/remotebackend/unittest_zeromq.rb
@@ -8,6 +8,10 @@ require './unittest'
 
 h = Handler.new()
 f = File.open "/tmp/tmp.txt","a"
+runcond=true
+
+trap('INT') { runcond = false }
+trap('TERM') { runcond = false }
 
 begin
   context = ZeroMQ::Context.new
@@ -16,7 +20,7 @@ begin
  
   print "[#{Time.now.to_s}] ZeroMQ unit test responder running\n"
 
-  while(true) do
+  while(runcond) do
     line = ""
     rc = socket.recv_string line
     f.puts line
@@ -43,7 +47,7 @@ begin
       next
     end
   end
-rescue SystemExit, Interrupt
+rescue SystemExit, Interrupt, Errno::EINTR
 end
 
 print "[#{Time.now.to_s}] ZeroMQ unit test responder ended\n"