Changeset 13755

Timestamp:

05/16/08 22:20:25 (14 months ago)

Author:

gregw

Message:

fixed #6776 reduced console.log entries

Files:

• dojox/trunk/cometd/_base.js (modified) (15 diffs)

dojox/trunk/cometd/_base.js

@@ -101 +101 @@
                 this.url = root||dojo.config["cometdRoot"];
                 if(!this.url){
-                        console.debug("no cometd root specified in djConfig and no root passed");
+                        throw "no cometd root";
                         return null;
                 }
@@ -137 +137 @@
                         }),
                         error: dojo.hitch(this,function(e){
-                                console.debug("handshake error!:",e);
                                 this._backoff();
                                 this._finishInit([{}]);
@@ -143 +142 @@
                         timeoutSeconds: this.expectedNetworkDelay/1000,
                         timeout: dojo.hitch(this, function(){
-                                console.debug("handshake timeout!");
                                 this._backoff();
                                 this._finishInit([{}]);
@@ -389 +387 @@
                 }
                 this._initialized=false;
+                this._handshook=false;
                 dojo.publish("/cometd/meta", [{cometd:this,action:"disconnect",successful:true,state:this.state()}]);
         }
@@ -429 +428 @@
                 var i=this._backoffInterval+(this._advice?(this._advice.interval?this._advice.interval:0):0);
                 if (i>0){
-                        console.debug("Retry in interval+backoff="+this._advice.interval+"+"+this._backoffInterval+"="+i+"ms");
+                        if (console.log)
+                            console.log("Retry in interval+backoff="+this._advice.interval+"+"+this._backoffInterval+"="+i+"ms");
                 }
                 return i;
@@ -450 +450 @@
                 // check version
                 if(data.version < this.minimumVersion){
-                        console.debug("cometd protocol version mismatch. We wanted", this.minimumVersion, "but got", data.version);
+                        if (console.log)
+                            console.log("cometd protocol version mismatch. We wanted", this.minimumVersion, "but got", data.version);
                         successful=false;
                         this._advice.reconnect="none";
@@ -477 +478 @@
                 }else{
                         // If there is a problem
-                        console.debug("cometd init failed");
+                        if (console.log)
+                                console.log("cometd init failed");
                         // follow advice
-                        if(this._advice && this._advice["reconnect"]=="none"){
-                                console.debug("cometd reconnect: none");
-                        }else{
+                        if(!this._advice || this._advice["reconnect"]!="none"){
                                 setTimeout(dojo.hitch(this, "init", this.url, this._props),this._interval());
                         }
@@ -518 +518 @@
                 if(!message["channel"]){
                         if(message["success"] !== true){
-                                console.debug("cometd error: no channel for message!", message);
                                 return;
                         }
@@ -606 +605 @@
                                 dojo.publish(tname,messages);
                         }catch(e){
-                                console.debug(e);
+                                if (console.log)
+                                        console.log(e);
                         }
                 }
@@ -612 +612 @@
 
         this._sendMessage = function(/* object */ message){
-                // console.debug(this.currentTransport, this._connected, this.batch);
-                // if(this.currentTransport && this._connected && !this.batch){
                 if(this.currentTransport && !this.batch){
                         return this.currentTransport.sendMessages([message]);
@@ -736 +734 @@
                         
                 if(this._cometd._advice && this._cometd._advice["reconnect"]=="none"){
-                        console.debug("cometd reconnect: none");
                         return;
                 }
@@ -745 +742 @@
                 if(!this._cometd._initialized){ return; }
                 if(this._cometd._polling) {
-                        console.debug("wait for poll to complete or fail");
                         return;
                 }
@@ -786 +782 @@
                         error: dojo.hitch(this, function(err){
                                 this._cometd._polling=false;
-                                console.debug("tunnel opening failed:", err);
                                 dojo.publish("/cometd/meta", [{cometd:this._cometd,action:"connect",successful:false,state:this._cometd.state()}]);
                                 this._cometd._backoff();
@@ -811 +806 @@
                         handleAs: this._cometd.handleAs,
                         load: dojo.hitch(this._cometd, "deliver"),
-                        error: dojo.hitch(this, function(err){
-                                console.debug('dropped messages: ',messages);
-                        }),
                         content: {
                                 message: dojo.toJson(messages)
@@ -899 +891 @@
                         error: dojo.hitch(this, function(err){
                                 this._cometd._polling=false;
-                                console.debug("tunnel opening failed:", err);
                                 dojo.publish("/cometd/meta", [{cometd:this._cometd,action:"connect",successful:false,state:this._cometd.state()}]);
                                 this._cometd._backoff();