Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits: e820dbef by lovetox at 2021-03-21T14:06:15+01:00 Add logging for method iq_request_task calls
- - - - - 0c0d9c20 by lovetox at 2021-03-21T14:18:40+01:00 Remove obsolete logging
- - - - -
12 changed files:
- nbxmpp/modules/annotations.py - nbxmpp/modules/blocking.py - nbxmpp/modules/discovery.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/ping.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/roster.py - nbxmpp/modules/software_version.py - nbxmpp/modules/user_avatar.py - nbxmpp/modules/util.py - nbxmpp/task.py
Changes:
===================================== nbxmpp/modules/annotations.py ===================================== @@ -82,8 +82,6 @@ class Annotations(BaseModule): def set_annotations(self, notes): _task = yield
- self._log.info('Set annotations for %s:', self.domain) - for note in notes: self._log.info(note)
===================================== nbxmpp/modules/blocking.py ===================================== @@ -69,8 +69,6 @@ class Blocking(BaseModule): def block(self, jids, report=None): _task = yield
- self._log.info('Block: %s', jids) - response = yield _make_block_request(jids, report) yield process_response(response)
@@ -78,8 +76,6 @@ class Blocking(BaseModule): def unblock(self, jids): _task = yield
- self._log.info('Unblock: %s', jids) - response = yield _make_unblock_request(jids) yield process_response(response)
===================================== nbxmpp/modules/discovery.py ===================================== @@ -62,8 +62,6 @@ class Discovery(BaseModule): def disco_info(self, jid, node=None): _task = yield
- self._log.info('Disco info: %s, node: %s', jid, node) - response = yield get_disco_request(Namespace.DISCO_INFO, jid, node) if response.isError(): raise StanzaError(response) @@ -73,8 +71,6 @@ class Discovery(BaseModule): def disco_items(self, jid, node=None): _task = yield
- self._log.info('Disco items: %s, node: %s', jid, node) - response = yield get_disco_request(Namespace.DISCO_ITEMS, jid, node) if response.isError(): raise StanzaError(response)
===================================== nbxmpp/modules/omemo.py ===================================== @@ -97,8 +97,6 @@ class OMEMO(BaseModule): def set_devicelist(self, devicelist=None, public=True): task = yield
- self._log.info('Set devicelist: %s', devicelist) - access_model = 'open' if public else 'presence'
options = { @@ -133,8 +131,6 @@ class OMEMO(BaseModule): def set_bundle(self, bundle, device_id, public=True): task = yield
- self._log.info('Set bundle') - access_model = 'open' if public else 'presence'
options = { @@ -155,8 +151,6 @@ class OMEMO(BaseModule): def request_bundle(self, jid, device_id): task = yield
- self._log.info('Request bundle from: %s %s', jid, device_id) - items = yield self.request_items( f'{Namespace.OMEMO_TEMP_BUNDLE}:{device_id}', max_items=1,
===================================== nbxmpp/modules/openpgp.py ===================================== @@ -135,8 +135,6 @@ class OpenPGP(BaseModule): 'pubsub#access_model': access_model, }
- self._log.info('Set keylist: %s', keylist) - result = yield self.publish(Namespace.OPENPGP_PK, _make_keylist(keylist), id_='current', @@ -149,8 +147,6 @@ class OpenPGP(BaseModule): def set_public_key(self, key, fingerprint, date, public=True): task = yield
- self._log.info('Set public key') - access_model = 'open' if public else 'presence'
options = { @@ -170,8 +166,6 @@ class OpenPGP(BaseModule): def request_public_key(self, jid, fingerprint): task = yield
- self._log.info('Request public key from: %s %s', jid, fingerprint) - items = yield self.request_items( f'{Namespace.OPENPGP_PK}:{fingerprint}', max_items=1, @@ -193,8 +187,6 @@ class OpenPGP(BaseModule): def request_keylist(self, jid=None): task = yield
- self._log.info('Request keylist from: %s', jid) - items = yield self.request_items( Namespace.OPENPGP_PK, max_items=1, @@ -217,8 +209,6 @@ class OpenPGP(BaseModule): def request_secret_key(self): task = yield
- self._log.info('Request secret key') - items = yield self.request_items( Namespace.OPENPGP_SK, max_items=1) @@ -239,8 +229,6 @@ class OpenPGP(BaseModule): def set_secret_key(self, secret_key): task = yield
- self._log.info('Set public key') - options = { 'pubsub#persist_items': 'true', 'pubsub#access_model': 'whitelist',
===================================== nbxmpp/modules/ping.py ===================================== @@ -47,7 +47,6 @@ class Ping(BaseModule): def ping(self, jid): _task = yield
- self._log.info('Ping') response = yield _make_ping_request(jid) yield process_response(response)
===================================== nbxmpp/modules/pubsub.py ===================================== @@ -148,8 +148,6 @@ class PubSub(BaseModule): def get_access_model(self, node): _task = yield
- self._log.info('Request access model') - result = yield self.get_node_configuration(node)
raise_if_error(result) @@ -179,8 +177,6 @@ class PubSub(BaseModule):
result.form['pubsub#access_model'].value = model
- self._log.info('Set access model %s', model) - result = yield self.set_node_configuration(node, result.form)
yield finalize(task, result)
===================================== nbxmpp/modules/roster.py ===================================== @@ -55,8 +55,7 @@ class Roster(BaseModule): if ver_support and version is None: version = ''
- self._log.info('Request Roster, version: %s, ver support: %s', - version, ver_support) + self._log.info('Roster versioning supported: %s', ver_support)
response = yield _make_request(version, ver_support) if response.isError():
===================================== nbxmpp/modules/software_version.py ===================================== @@ -59,8 +59,6 @@ class SoftwareVersion(BaseModule): def request_software_version(self, jid): _task = yield
- self._log.info('Request software version for %s', jid) - response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) if response.isError(): raise StanzaError(response)
===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -159,7 +159,6 @@ class UserAvatar(BaseModule):
for info, data in avatar.pubsub_avatar_info(): item = _make_avatar_data_node(data) - self._log.info('Publish avatar data: %s, %s', info, access_model)
result = yield self.publish(Namespace.AVATAR_DATA, item, @@ -178,8 +177,6 @@ class UserAvatar(BaseModule): def _publish_avatar_metadata(self, metadata, access_model): task = yield
- self._log.info('Publish avatar meta data: %s', metadata) - options = { 'pubsub#persist_items': 'true', 'pubsub#access_model': access_model,
===================================== nbxmpp/modules/util.py ===================================== @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see http://www.gnu.org/licenses/.
+import inspect from urllib.parse import urlparse from urllib.parse import unquote
@@ -61,3 +62,16 @@ def parse_xmpp_uri(uri): dict_[key] = unquote(value)
return (url.path, action, dict_) + + +def make_func_arguments_string(func, self, args, kwargs): + signature = inspect.signature(func) + bound_arguments = signature.bind(self, *args, **kwargs) + bound_arguments.apply_defaults() + arg_string = '' + for name, arg in bound_arguments.arguments.items(): + if name == 'self': + continue + arg_string += f'{name}={arg}, ' + arg_string = arg_string[:-2] + return f'{func.__name__}({arg_string})'
===================================== nbxmpp/task.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError from nbxmpp.errors import TimeoutStanzaError from nbxmpp.simplexml import Node +from nbxmpp.modules.util import make_func_arguments_string
log = logging.getLogger('nbxmpp.task') @@ -78,6 +79,8 @@ def _setup_task(task, client, callback, user_data): def iq_request_task(func): @wraps(func) def func_wrapper(self, *args, timeout=None, callback=None, user_data=None, **kwargs): + if self._log.isEnabledFor(logging.INFO): + self._log.info(make_func_arguments_string(func, self, args, kwargs)) task = IqRequestTask(func(self, *args, **kwargs), self._log, self._client)
View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/bab56bc1ab75a8bbad498c7b...