Changeset 489

Timestamp:

08/12/08 11:12:09 (5 months ago)

Author:

heyadayo

Message:

Fixed a timeout bug in CometSession?; fixed a logging bug in safari; safari3 (windows) now works

Location:

trunk/daemon

Files:

• orbited-debug.cfg (modified) (1 diff)
• orbited/static/Orbited.js (modified) (7 diffs)
• orbited/transports/xhrstream.py (modified) (1 diff)

trunk/daemon/orbited-debug.cfg

@@ -2 +2 @@
 reactor=epoll
 proxy.enabled=1
-session.ping_interval = 2
-session.ping_timeout = 2
+session.ping_interval = 3
+session.ping_timeout = 4
 
 [listen]

trunk/daemon/orbited/static/Orbited.js

@@ -41 +41 @@
 Orbited.settings.HEARTBEAT_TIMEOUT = 6000
 Orbited.settings.POLL_INTERVAL = 2000
+Orbited.settings.pageLoggerHeight = '200px'
+Orbited.settings.pageLoggerWidth = null;
+
 Orbited.singleton = {}
 
@@ -152 +155 @@
     Orbited.util.loggingSystem = 'log4js';
 }
-else if (window.console && console.log) {
+else if (window.console && console.firebug) {
     Orbited.util.loggingSystem = 'firebug';
 }
@@ -168 +171 @@
 
             default:
-                logger = new Orbited.Loggers.EmptyLogger(name);
+                logger = new Orbited.Loggers.PageLogger(name);
                 break;
         }
@@ -223 +226 @@
     }
 }
-
-Orbited.Loggers.EmptyLogger = function(name) {
+Orbited.singleton.pageLoggerPane = null;
+
+Orbited.Loggers.PageLogger = function(name) {
     var self = this;
     self.enabled = false;
     self.name = name;
+
+    var checkPane = function() {
+        if (!Orbited.singleton.pageLoggerPane) {
+            var p = document.createElement("div");
+            p.border = "1px solid black"
+            if(Orbited.settings.pageLoggerHeight) {
+                p.style.height = Orbited.settings.pageLoggerHeight;
+            }
+            if(Orbited.settings.pageLoggerWidth) {
+                p.style.height = Orbited.settings.pageLoggerWidth;
+            }
+
+            p.style.overflow = "scroll"
+            document.body.appendChild(p)
+            Orbited.singleton.pageLoggerPane = p
+        }
+    }
+    var show = function(data) {
+        checkPane();
+        var d = document.createElement('div')
+        d.innerHTML = data
+        Orbited.singleton.pageLoggerPane.appendChild(d)
+        Orbited.singleton.pageLoggerPane.scrollTop = Orbited.singleton.pageLoggerPane.scrollHeight;
+    }
     self.log = function() {
     }
     self.debug = function() {
         if (!self.enabled) { return }
-        var newArgs = [ "<b>" + name + "</b>" ]
+        var newArgs = [ new Date(), "<b>" + name + "</b>" ]
         for (var i = 0; i < arguments.length; ++i) {
             newArgs.push(arguments[i]);
         }
-        d = document.createElement('div')
-        d.innerHTML = newArgs.join(", ")
-        document.body.appendChild(d)
+        show(newArgs.join(", "));
     }
     self.info = function() {
@@ -602 +628 @@
                 case 4:
                     if (xhr.status == 200) {
+                        resetTimeout();
                         sendQueue.splice(0, numSent)
                         return doSend();
@@ -638 +665 @@
 
     var resetTimeout = function() {
+;;;     self.logger.debug('reset Timeout', pingInterval+pingTimeout)
         unsetTimeout();
         timeoutTimer = window.setTimeout(timedOut, pingInterval + pingTimeout);
@@ -646 +674 @@
     }
     var timedOut = function() {
+;;;     self.logger.debug('timed out!')
         doClose(Orbited.Errors.ConnectionTimeout)
     }

trunk/daemon/orbited/transports/xhrstream.py

@@ -4 +4 @@
 
 MAXBYTES = 1048576
-
+#MAXBYTES = 64
 class XHRStreamingTransport(CometTransport):