changing order of sending messages

tereska · May 9, 2012 · c2e7146 · c2e7146
1 parent be27942
commit c2e7146
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/lib/Node.js b/lib/Node.js
@@ -26,7 +26,20 @@ Node.prototype.added = function(server) {
   }, this);
 };
 
+Node.prototype._initForward = function(message, denied, user, pass){
+  var channel = message.channel;
+  if (META.test(channel) || SERVICE.test(channel) || CLUSTER.test(channel)) return;
+  if (message.ext && message.ext.cluster) return;
+  if (denied) return;
+  if(user!=null && pass!=null){
+      message.data.username = user;
+      message.data.password = pass;
+  }
+  this._forward(message);
+};
+
 Node.prototype.incoming = function(message, callback) {
+
   var channel = message.channel;
   var user = null;
   var pass = null;
@@ -47,16 +60,9 @@ Node.prototype.incoming = function(message, callback) {
           console.log('PUBLISH_DENIED');
     		}
 	}
+
+  this._initForward(message, denied, user, pass);
   callback(message);
-
-  if (META.test(channel) || SERVICE.test(channel) || CLUSTER.test(channel)) return;
-  if (message.ext && message.ext.cluster) return;
-  if (denied) return;
-  if(user!=null && pass !=null){
-      message.data.username = user;
-      message.data.password = pass;
-  }
-  this._forward(message);
 };
 
 Node.prototype.outgoing = function(message, callback) {