From 3eafcdfbdc03d3cc62352bda20d736445eed4e70 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Fri, 27 Dec 2013 12:35:05 +0200 Subject: [PATCH] Handle signals better --- modules/remotebackend/unittest_zeromq.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/remotebackend/unittest_zeromq.rb b/modules/remotebackend/unittest_zeromq.rb index 11b825d981..be8569d92b 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" -- 2.47.3