From 71bf2fd13138da2e4306fe4b5af786fa667f4a62 Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Mon, 21 Apr 2014 18:56:40 +0900 Subject: [PATCH] Don't freak out if trying to close a socket that was already closed. --- lib/roles/processor.js | 7 +++++-- lib/roles/provider.js | 7 +++++-- lib/roles/reaper.js | 6 +++++- lib/roles/triproxy.js | 9 ++++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lib/roles/processor.js b/lib/roles/processor.js index 076021f9..7db5b47e 100644 --- a/lib/roles/processor.js +++ b/lib/roles/processor.js @@ -97,7 +97,10 @@ module.exports = function(options) { .handler()) lifecycle.observe(function() { - appDealer.close() - devDealer.close() + try { + appDealer.close() + devDealer.close() + } + catch (err) {} }) } diff --git a/lib/roles/provider.js b/lib/roles/provider.js index af8d18d6..be4f05a4 100644 --- a/lib/roles/provider.js +++ b/lib/roles/provider.js @@ -365,8 +365,11 @@ module.exports = function(options) { lifecycle.observe(function() { clearTimeout(totalsTimer) - push.close() - sub.close() + try { + push.close() + sub.close() + } + catch (err) {} return Promise.all(Object.keys(workers).map(function(serial) { return workers[serial].cancel() diff --git a/lib/roles/reaper.js b/lib/roles/reaper.js index 204ff30a..ae4093f7 100644 --- a/lib/roles/reaper.js +++ b/lib/roles/reaper.js @@ -49,6 +49,10 @@ module.exports = function(options) { lifecycle.observe(function() { clearTimeout(timer) - push.close() + + try { + push.close() + } + catch (err) {} }) } diff --git a/lib/roles/triproxy.js b/lib/roles/triproxy.js index 367aedeb..47d22932 100644 --- a/lib/roles/triproxy.js +++ b/lib/roles/triproxy.js @@ -34,8 +34,11 @@ module.exports = function(options) { log.info('PULL socket bound on', options.endpoints.pull) lifecycle.observe(function() { - pub.close() - dealer.close() - pull.close() + try { + pub.close() + dealer.close() + pull.close() + } + catch (err) {} }) }