Additional refinement / tweaking

lib/dns.js

@@ -215,21 +215,20 @@ exports.lookupService = function(host, port, callback) {
 
 function onresolve(err, result) {
   const emitter = this.emitter;
-  if (err) {
-    process.nextTick(() => {
+  process.nextTick(() => {
+    if (err) {
       emitter.emit('error',
                    errnoException(err, this.bindingName, this.hostname));
-    });
-  } else {
-    process.nextTick(() => {
+    } else {
       emitter.emit('resolve', result);
-    });
-  }
-  // Decrement the outstanding resolve counter.
-  _resolvesOutstanding--;
+    }
+  });
   // This has to be done on setImmediate in order to give c-ares
   // time to cleanup after the resolve completes.
-  setImmediate(() => emitter.emit('complete'));
+  setImmediate(() => {
+    _resolvesOutstanding--;
+    emitter.emit('complete');
+  });
 }
 
 class Resolver extends EventEmitter {
@@ -240,7 +239,7 @@ class Resolver extends EventEmitter {
       throw new Error('"name" argument must be a string');
     }
     // Do this on nextTick in order to give users time to
-    // attach the on 'complete' listener.
+    // attach the listeners.
     process.nextTick(() => {
       var req = new QueryReqWrap();
       req.bindingName = bindingName;
@@ -258,8 +257,8 @@ class Resolver extends EventEmitter {
       }
       var err = binding(req, name);
       if (err) {
-        _resolvesOutstanding--;
         req.emitter.emit('error', errnoException(err, bindingName));
+        _resolvesOutstanding--;
       }
     });
   }