From 38b0797c180cb6f49d20df8dd03b2fba7dab9909 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 22 May 2017 14:38:59 -0500 Subject: [PATCH] Fix exception on ^C Defer the stop to happen outside of the trap handler so that EM won't freak out about it. --- sgx-catapult.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sgx-catapult.rb b/sgx-catapult.rb index b5a41511d24e49b5955e3d678e65e5e8bd625728..892f29b8a7cb70625d08675fcba016d1f6724774 100755 --- a/sgx-catapult.rb +++ b/sgx-catapult.rb @@ -1038,11 +1038,13 @@ at_exit do server.start do ["INT", "TERM"].each do |sig| trap(sig) do - puts 'Shutting down gateway...' - SGXcatapult.shutdown + EM.defer do + puts 'Shutting down gateway...' + SGXcatapult.shutdown - puts 'Gateway has terminated.' - EM.stop + puts 'Gateway has terminated.' + EM.stop + end end end end