Clean up close()

jhead · Mar 23, 2016 · b5019d6 · b5019d6
1 parent b2b60ed
commit b5019d6
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/lib/queue.js b/lib/queue.js
@@ -20,6 +20,7 @@ let MessageQueue = function(key, perms, options) {
   this.flags = formatFlags(perms);
   this.options = options || { };
 
+  this.closed = false;
   this.receiveBuffer = [];
 
   this.on('newListener', (event) => {
@@ -134,10 +135,23 @@ MessageQueue.prototype.pop = function(options, callback) {
   this._receive(options, callback);
 };
 
-MessageQueue.prototype.close = function() {
-  if (this.closed) throw new Error('Queue already closed');
+MessageQueue.prototype.close = function(callback) {
+  callback = callback || Function.prototype;
 
-  return (this.closed = msg.close(this.id));
+  if (this.closed) {
+    callback(null, true);
+    return true;
+  }
+
+  try {
+    this.closed = msg.close(this.id)
+  } catch (err) {
+    callback(err, false);
+    return false;
+  }
+
+  callback(null, true);
+  return true;
 };
 
 function formatFlags(perms) {
@@ -157,7 +171,6 @@ function formatFlags(perms) {
 // Static members and constants
 const IPC_CREATE = MessageQueue.IPC_CREATE = 512;
 const MSGMAX = MessageQueue.MSGMAX = 4052;
-// MessageQueue.IPC_RMID =
 MessageQueue.formatFlags = formatFlags;
 
 // Export native bindings