Changeset 9877 for branches/bosh_support/src/common/connection.py

Timestamp:

07/03/08 01:29:10 (5 months ago)

Author:

tomk

Message:

moved bosh code from client_nb.py to bosh.py, replaced debug logging with debug.py by logging in whole xmpppy (debug.py is now unused)

Files:

• branches/bosh_support/src/common/connection.py (modified) (3 diffs)

branches/bosh_support/src/common/connection.py

@@ -209 +209 @@
         def _disconnectedReconnCB(self):
                 '''Called when we are disconnected'''
-                log.error('disconnectedReconnCB')
+                log.info('disconnectedReconnCB called')
                 if gajim.account_is_connected(self.name):
                         # we cannot change our status to offline or connecting
@@ -532 +532 @@
 
                         if self._proxy and self._proxy['type'] == 'bosh': 
-                                clientClass = common.xmpp.BOSHClient
+                                clientClass = common.xmpp.bosh.BOSHClient
                         else:
                                 clientClass = common.xmpp.NonBlockingClient
 
-                        if gajim.verbose:
-                                con = common.xmpp.NonBlockingClient(
-                                        hostname=self._current_host['host'],
-                                        port=port,
-                                        caller=self,
-                                        idlequeue=gajim.idlequeue)
-                        else:
-                                con = common.xmpp.NonBlockingClient(
-                                        hostname=self._current_host['host'],
-                                        debug=[],
-                                        port=port,
-                                        caller=self,
-                                        idlequeue=gajim.idlequeue)
+                        # there was:
+                        # "if gajim.verbose:"
+                        # here
+                        con = clientClass(
+                                domain=self._hostname,
+                                caller=self,
+                                idlequeue=gajim.idlequeue)
 
                         self.last_connection = con
@@ -556 +550 @@
                         if self.on_connect_success == self._on_new_account:
                                 con.RegisterDisconnectHandler(self._on_new_account)
+
+                        # FIXME: BOSH properties should be in proxy dictionary - loaded from
+                        # config
+                        if self._proxy and self._proxy['type'] == 'bosh': 
+                                self._proxy['bosh_hold'] = '1'
+                                self._proxy['bosh_wait'] = '60'
+
                         
                         log.info('Connecting to %s: [%s:%d]', self.name,
                                 self._current_host['host'], port)
                         con.connect(
+                                hostname=self._current_host['host'],
+                                port=port,
                                 on_connect=self.on_connect_success,
                                 on_proxy_failure=self.on_proxy_failure,