erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: use of the new core.log module:

Browse source 
/!\ this is a massive refactoring and was largely automated, it probably did bring some bugs /!\
This commit is contained in:
Goffi 2014-04-19 19:19:19 +02:00
commit 501bc92528
1 changed files with 707 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/plugins/plugin_xep_0115.py
View file

@ -19,7 +19,8 @@
from sat.core.i18n import _
from sat.core.constants import Const as C
from logging import debug, info, error, warning
from sat.core.log import getLogger
log = getLogger(__name__)
from twisted.words.xish import domish
from twisted.words.protocols.jabber import jid
from twisted.internet import defer
@ -52,7 +53,7 @@ class XEP_0115(object):
cap_hash = None # capabilities hash is class variable as it is common to all profiles
def __init__(self, host):
info(_("Plugin XEP_0115 initialization"))
log.info(_("Plugin XEP_0115 initialization"))
self.host = host
host.trigger.add("Disco handled", self._checkHash)
host.trigger.add("Presence send", self._presenceTrigger)
@ -69,10 +70,10 @@ class XEP_0115(object):
def updateOptimize(optimize):
client.caps_optimize = optimize
if optimize:
info(_("Caps optimisation enabled"))
log.info(_("Caps optimisation enabled"))
client.caps_sent = False
else:
warning(_("Caps optimisation not available"))
log.warning(_("Caps optimisation not available"))
disco_d.addCallback(updateOptimize)
disco_d.addCallback(lambda dummy: self.recalculateHash(profile))
return True
@ -94,8 +95,8 @@ class XEP_0115(object):
for item in _infos:
disco_infos.append(item)
cap_hash = self.host.memory.disco.generateHash(disco_infos)
info("Our capability hash has been generated: [%s]" % cap_hash)
debug("Generating capability domish.Element")
log.info("Our capability hash has been generated: [%s]" % cap_hash)
log.debug("Generating capability domish.Element")
c_elt = domish.Element((NS_ENTITY_CAPABILITY, 'c'))
c_elt['hash'] = 'sha-1'
c_elt['node'] = C.APP_URL
@ -140,21 +141,21 @@ class XEP_0115_handler(XMPPHandler):
c_hash = c_elem['hash']
c_node = c_elem['node']
except KeyError:
warning(_('Received invalid capabilities tag'))
log.warning(_('Received invalid capabilities tag'))
return
if c_ver in self.host.memory.disco.hashes:
# we already know the hash, we update the jid entity
debug ("hash [%(hash)s] already in cache, updating entity [%(jid)s]" % {'hash': c_ver, 'jid': from_jid.full()})
log.debug ("hash [%(hash)s] already in cache, updating entity [%(jid)s]" % {'hash': c_ver, 'jid': from_jid.full()})
self.host.memory.updateEntityData(from_jid, C.ENTITY_CAP_HASH, c_ver, self.profile)
return
yield self.host.getDiscoInfos(from_jid, self.profile)
if c_hash != 'sha-1':
#unknown hash method
warning(_('Unknown hash method for entity capabilities: [%(hash_method)s] (entity: %(jid)s, node: %(node)s)') % {'hash_method':c_hash, 'jid': from_jid, 'node': c_node})
log.warning(_('Unknown hash method for entity capabilities: [%(hash_method)s] (entity: %(jid)s, node: %(node)s)') % {'hash_method':c_hash, 'jid': from_jid, 'node': c_node})
computed_hash = self.host.memory.getEntityDatum(from_jid, C.ENTITY_CAP_HASH, self.profile)
if computed_hash != c_ver:
warning(_('Computed hash differ from given hash:\ngiven: [%(given_hash)s]\ncomputed: [%(computed_hash)s]\n(entity: %(jid)s, node: %(node)s)') % {'given_hash':c_ver, 'computed_hash': computed_hash, 'jid': from_jid, 'node': c_node})
log.warning(_('Computed hash differ from given hash:\ngiven: [%(given_hash)s]\ncomputed: [%(computed_hash)s]\n(entity: %(jid)s, node: %(node)s)') % {'given_hash':c_ver, 'computed_hash': computed_hash, 'jid': from_jid, 'node': c_node})
# TODO: me must manage the full algorithm described at XEP-0115 #5.4 part 3