changeset 6d12283cb71f in /home/hg/repos/gajim-plugins

author: Bahtiar `kalkin-` Gadimov bahtiar@gadimov.de branches: details:gajim-plugins?cmd=changeset;node=6d12283cb71f description: Make logging less verbose

If you are working on `gajim-omemo` you can just use `./launch.sh -l plugin_system.omemo=INFO` to get only the important bits.

diffstat:

omemo/__init__.py | 17 +++++++++-------- omemo/state.py | 10 ++++++---- 2 files changed, 15 insertions(+), 12 deletions(-)

diffs (86 lines):

diff -r 7f9ea09339e6 -r 6d12283cb71f omemo/__init__.py --- a/omemo/__init__.py Fri Jan 08 02:25:13 2016 +0100 +++ b/omemo/__init__.py Sun Jan 10 12:52:54 2016 +0100 @@ -172,7 +172,7 @@ my_jid = gajim.get_jid_from_account(account_name)

if contact_jid == my_jid: - log.debug(state.name + ' ⇒ Received own device_list:' + str( + log.info(state.name + ' ⇒ Received own device_list:' + str( devices_list)) state.add_own_devices(devices_list)

@@ -185,8 +185,8 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: - log.debug(account_name + ' ⇒ Received device_list for ' + - contact_jid + ':' + str(devices_list)) + log.info(account_name + ' ⇒ Received device_list for ' + + contact_jid + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) if account_name in self.ui_list and contact_jid not in self.ui_list[ account_name]: @@ -226,7 +226,7 @@ self.ui_list[account_name][contact_jid] = Ui(self, chat_control, omemo_enabled) else: - log.debug(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid) + log.warn(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid)

def are_keys_missing(self, contact): """ Used by the ui to set the state of the PreKeyButton. """ @@ -236,8 +236,9 @@ result = 0 result += len(state.devices_without_sessions(str(contact.jid))) result += len(state.own_devices_without_sessions(my_jid)) - log.debug(account + " ⇒ Missing keys for " + contact.jid + ": " + str( - result)) + if result > 0: + log.warn(account + " ⇒ Missing keys for " + contact.jid + ": " + + str(result)) return result

@log_calls('OmemoPlugin') @@ -389,12 +390,12 @@ if successful(stanza): log.debug(account + ' → Publishing bundle was successful') if not state.own_device_id_published(): - log.debug(account + ' → Device list needs updating') + log.warn(account + ' → Device list needs updating') self.publish_own_devices_list(state) else: log.debug(account + ' → Device list up to date') else: - log.debug(account + ' → Publishing bundle was NOT successful') + log.error(account + ' → Publishing bundle was NOT successful')

@log_calls('OmemoPlugin') def clear_device_list(self, contact): diff -r 7f9ea09339e6 -r 6d12283cb71f omemo/state.py --- a/omemo/state.py Fri Jan 08 02:25:13 2016 +0100 +++ b/omemo/state.py Sun Jan 10 12:52:54 2016 +0100 @@ -219,8 +219,9 @@ missing_devices = [dev for dev in known_devices if not self.store.containsSession(jid, dev)] - log.debug(self.name + ' → Missing device sessions: ' + str( - missing_devices)) + if missing_devices: + log.debug(self.name + ' → Missing device sessions: ' + str( + missing_devices)) return missing_devices

def own_devices_without_sessions(self, own_jid): @@ -240,8 +241,9 @@ missing_devices = [dev for dev in known_devices if not self.store.containsSession(own_jid, dev)] - log.debug(self.name + ' → Missing device sessions: ' + str( - missing_devices)) + if missing_devices: + log.debug(self.name + ' → Missing device sessions: ' + str( + missing_devices)) return missing_devices

def get_session_cipher(self, jid, device_id):