Changeset 488

Show
Ignore:
Timestamp:
08/12/08 09:45:28 (5 months ago)
Author:
heyadayo
Message:

fixed a reconnect timer/timeout bugs with XHRStream and HTMLFile; removed print statements from config.py

Location:
trunk/daemon
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/daemon/orbited-debug.cfg

    r487 r488  
    22reactor=epoll 
    33proxy.enabled=1 
    4 session.ping_interval = 5 
    5 session.ping_timeout = 5 
     4session.ping_interval = 2 
     5session.ping_timeout = 2 
    66 
    77[listen] 

  • trunk/daemon/orbited/config.py

    r487 r488  
    110110                source, dest = line.split('->') 
    111111                source, dest = source.strip(), dest.strip() 
    112                 print 'dest is', dest 
    113                 print 'source is', source 
    114112                if ':' in dest: 
    115113                    daddr, dport = dest.split(':', 1) 

  • trunk/daemon/orbited/static/Orbited.js

    r487 r488  
    17411741        restartTimeout*=2; 
    17421742        ifr.src = restartUrl; 
    1743         var restartTimer = window.setTimeout(reconnect, restartTimeout)         
     1743        restartTimer = window.setTimeout(reconnect, restartTimeout)         
    17441744    } 
    17451745 
    … …  
    17701770            return 
    17711771        } 
     1772;;;     self.logger.debug('close called, clearing timer'); 
     1773        window.clearTimeout(restartTimer); 
    17721774        self.readyState = 2 
    17731775        ifr.src = 'about:blank'