projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding an async pool to try and fix things up
[theonering]
/
src
/
connection.py
diff --git
a/src/connection.py
b/src/connection.py
index
b097993
..
236dc9a
100644
(file)
--- a/
src/connection.py
+++ b/
src/connection.py
@@
-12,18
+12,19
@@
import util.misc as misc_utils
import gvoice
import handle
import gvoice
import handle
-import requests
-import contacts
import aliasing
import aliasing
-import simple_presence
-import presence
+import avatars
import capabilities
import capabilities
+import contacts
+import presence
+import requests
+import simple_presence
import autogv
import channel_manager
import autogv
import channel_manager
-_moduleLogger = logging.getLogger("connection")
+_moduleLogger = logging.getLogger(__name__)
class TheOneRingOptions(object):
class TheOneRingOptions(object):
@@
-50,12
+51,13
@@
class TheOneRingOptions(object):
class TheOneRingConnection(
tp.Connection,
class TheOneRingConnection(
tp.Connection,
- requests.RequestsMixin,
- contacts.ContactsMixin,
aliasing.AliasingMixin,
aliasing.AliasingMixin,
- simple_presence.SimplePresenceMixin,
- presence.PresenceMixin,
+ avatars.AvatarsMixin,
capabilities.CapabilitiesMixin,
capabilities.CapabilitiesMixin,
+ contacts.ContactsMixin,
+ presence.PresenceMixin,
+ requests.RequestsMixin,
+ simple_presence.SimplePresenceMixin,
):
# overiding base class variable
):
# overiding base class variable
@@
-108,12
+110,13
@@
class TheOneRingConnection(
account,
constants._telepathy_implementation_name_
)
account,
constants._telepathy_implementation_name_
)
- requests.RequestsMixin.__init__(self)
- contacts.ContactsMixin.__init__(self)
aliasing.AliasingMixin.__init__(self)
aliasing.AliasingMixin.__init__(self)
- simple_presence.SimplePresenceMixin.__init__(self)
- presence.PresenceMixin.__init__(self)
+ avatars.AvatarsMixin.__init__(self)
capabilities.CapabilitiesMixin.__init__(self)
capabilities.CapabilitiesMixin.__init__(self)
+ contacts.ContactsMixin.__init__(self)
+ presence.PresenceMixin.__init__(self)
+ requests.RequestsMixin.__init__(self)
+ simple_presence.SimplePresenceMixin.__init__(self)
self.__manager = weakref.proxy(manager)
self.__credentials = (
self.__manager = weakref.proxy(manager)
self.__credentials = (
@@
-135,10
+138,13
@@
class TheOneRingConnection(
autogv.NewGVConversations(weakref.ref(self)),
autogv.RefreshVoicemail(weakref.ref(self)),
autogv.AutoDisconnect(weakref.ref(self)),
autogv.NewGVConversations(weakref.ref(self)),
autogv.RefreshVoicemail(weakref.ref(self)),
autogv.AutoDisconnect(weakref.ref(self)),
+ autogv.DelayEnableContactIntegration(constants._telepathy_implementation_name_),
]
self._delayedConnect = gobject_utils.Async(self._delayed_connect)
_moduleLogger.info("Connection to the account %s created" % account)
]
self._delayedConnect = gobject_utils.Async(self._delayed_connect)
_moduleLogger.info("Connection to the account %s created" % account)
+ self._timedDisconnect = autogv.TimedDisconnect(weakref.ref(self))
+ self._timedDisconnect.start()
@property
def manager(self):
@property
def manager(self):
@@
-163,11
+169,9
@@
class TheOneRingConnection(
def get_handle_by_name(self, handleType, handleName):
requestedHandleName = handleName.encode('utf-8')
if handleType == telepathy.HANDLE_TYPE_CONTACT:
def get_handle_by_name(self, handleType, handleName):
requestedHandleName = handleName.encode('utf-8')
if handleType == telepathy.HANDLE_TYPE_CONTACT:
- _moduleLogger.debug("get_handle_by_name Contact: %s" % requestedHandleName)
h = handle.create_handle(self, 'contact', requestedHandleName)
elif handleType == telepathy.HANDLE_TYPE_LIST:
# Support only server side (immutable) lists
h = handle.create_handle(self, 'contact', requestedHandleName)
elif handleType == telepathy.HANDLE_TYPE_LIST:
# Support only server side (immutable) lists
- _moduleLogger.debug("get_handle_by_name List: %s" % requestedHandleName)
h = handle.create_handle(self, 'list', requestedHandleName)
else:
raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
h = handle.create_handle(self, 'list', requestedHandleName)
else:
raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
@@
-187,6
+191,7
@@
class TheOneRingConnection(
return
_moduleLogger.info("Kicking off connect")
self._delayedConnect.start()
return
_moduleLogger.info("Kicking off connect")
self._delayedConnect.start()
+ self._timedDisconnect.stop()
@misc_utils.log_exception(_moduleLogger)
def _delayed_connect(self):
@misc_utils.log_exception(_moduleLogger)
def _delayed_connect(self):
@@
-214,11
+219,11
@@
class TheOneRingConnection(
publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish")
publishProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False)
self.__channelManager.channel_for_props(publishProps, signal=True)
publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish")
publishProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False)
self.__channelManager.channel_for_props(publishProps, signal=True)
- except gvoice.backend.NetworkError, e:
+ except gvoice.backend.NetworkError:
_moduleLogger.exception("Connection Failed")
self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
return
_moduleLogger.exception("Connection Failed")
self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
return
- except Exception, e:
+ except Exception:
_moduleLogger.exception("Connection Failed")
self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED)
return
_moduleLogger.exception("Connection Failed")
self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED)
return
@@
-235,7
+240,7
@@
class TheOneRingConnection(
For org.freedesktop.telepathy.Connection
"""
_moduleLogger.info("Kicking off disconnect")
For org.freedesktop.telepathy.Connection
"""
_moduleLogger.info("Kicking off disconnect")
- self._delayed_disconnect()
+ self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
@misc_utils.log_exception(_moduleLogger)
def RequestChannel(self, type, handleType, handleId, suppressHandler):
@misc_utils.log_exception(_moduleLogger)
def RequestChannel(self, type, handleType, handleId, suppressHandler):
@@
-274,15
+279,11
@@
class TheOneRingConnection(
return props
return props
- @gobject_utils.async
- def _delayed_disconnect(self):
- self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
- return False
-
def disconnect(self, reason):
_moduleLogger.info("Disconnecting")
self._delayedConnect.cancel()
def disconnect(self, reason):
_moduleLogger.info("Disconnecting")
self._delayedConnect.cancel()
+ self._timedDisconnect.stop()
# Not having the disconnect first can cause weird behavior with clients
# including not being able to reconnect or even crashing
# Not having the disconnect first can cause weird behavior with clients
# including not being able to reconnect or even crashing
@@
-295,9
+296,15
@@
class TheOneRingConnection(
plumber.stop()
self.__channelManager.close()
plumber.stop()
self.__channelManager.close()
+ self.manager.disconnected(self)
+
self.session.save(self.__cachePath)
self.session.logout()
self.session.close()
self.session.save(self.__cachePath)
self.session.logout()
self.session.close()
- self.manager.disconnected(self)
+ # In case one of the above items takes too long (which it should never
+ # do), we leave the starting of the shutdown-on-idle counter to the
+ # very end
+ self.manager.disconnect_completed()
+
_moduleLogger.info("Disconnected")
_moduleLogger.info("Disconnected")