changeset 4d60646803e4 in /home/hg/repos/gajim-plugins
author: lovetox <[email protected]>
branches:
details:gajim-plugins?cmd=changeset;node=4d60646803e4
description: Add attr 'account' to OmemoState / Log changes
Add attr account to OmemoState. We need this so all current
and future log messages can display the account it is coming from
diffstat:
omemo/__init__.py | 6 +++---
omemo/omemo/state.py | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diffs (66 lines):
diff -r b11bb49aa2e3 -r 4d60646803e4 omemo/__init__.py
--- a/omemo/__init__.py Wed Jun 15 18:51:36 2016 +0200
+++ b/omemo/__init__.py Wed Jun 15 20:12:33 2016 +0200
@@ -95,7 +95,7 @@
my_jid = gajim.get_jid_from_account(account)
- self.omemo_states[account] = OmemoState(my_jid, conn)
+ self.omemo_states[account] = OmemoState(my_jid, conn, account)
return self.omemo_states[account]
@log_calls('OmemoPlugin')
@@ -262,7 +262,7 @@
my_jid = gajim.get_jid_from_account(account_name)
if contact_jid == my_jid:
- log.info(account_name + ' => Received own device_list:' + str(
+ log.info(account_name + ' => Received own device list:' + str(
devices_list))
state.set_own_devices(devices_list)
@@ -275,7 +275,7 @@
devices_list.append(state.own_device_id)
self.publish_own_devices_list(account_name, state)
else:
- log.info(account_name + ' => Received device_list for ' +
+ log.info(account_name + ' => Received device list for ' +
contact_jid + ':' + str(devices_list))
state.set_devices(contact_jid, devices_list)
if (account_name in self.ui_list and
diff -r b11bb49aa2e3 -r 4d60646803e4 omemo/omemo/state.py
--- a/omemo/omemo/state.py Wed Jun 15 18:51:36 2016 +0200
+++ b/omemo/omemo/state.py Wed Jun 15 20:12:33 2016 +0200
@@ -47,11 +47,12 @@
class OmemoState:
- def __init__(self, own_jid, connection):
+ def __init__(self, own_jid, connection, account):
""" Instantiates an OmemoState object.
:param connection: an :py:class:`sqlite3.Connection`
"""
+ self.account = account
self.session_ciphers = {}
self.own_jid = own_jid
self.device_ids = {}
@@ -101,8 +102,9 @@
devices: [int]
A list of devices
"""
- log.debug('Saving devices for ' + name + ' => ' + str(devices))
+
self.device_ids[name] = devices
+ log.info(self.account + ' => Saved devices for ' + name)
def add_device(self, name, device_id):
if name not in self.device_ids:
@@ -120,6 +122,7 @@
A list of device_ids
"""
self.own_devices = devices
+ log.info(self.account + ' => Saved own devices')
def add_own_device(self, device_id):
if device_id not in self.own_devices:
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
