From c77a6b9d2117bf10d1aec43d2ddf4f1be75a6587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 10 May 2017 11:15:29 +0200 Subject: [PATCH] More logging in pillar.api.service.do_badger() --- pillar/api/service.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pillar/api/service.py b/pillar/api/service.py index c857385c..26eedf9b 100644 --- a/pillar/api/service.py +++ b/pillar/api/service.py @@ -82,19 +82,24 @@ def badger(): return do_badger(action, role, user_email=user_email) -def do_badger(action: str, role: str, *, user_email: str='', user_id: bson.ObjectId=None): +def do_badger(action: str, role: str, *, user_email: str = '', user_id: bson.ObjectId = None): """Performs a badger action, returning a HTTP response. Either user_email or user_id must be given. """ if action not in {'grant', 'revoke'}: + log.error('do_badger(%r, %r, %r, %r): action %r not supported.', + action, role, user_email, user_id, action) raise wz_exceptions.BadRequest('Action %r not supported' % action) if not user_email and user_id is None: + log.error('do_badger(%r, %r, %r, %r): neither email nor user_id given.', + action, role, user_email, user_id) raise wz_exceptions.BadRequest('User email not given') if not role: + log.error('do_badger(%r, %r, %r, %r): no role given.', action, role, user_email, user_id) raise wz_exceptions.BadRequest('Role not given') users_coll = current_app.data.driver.db['users'] @@ -123,6 +128,8 @@ def do_badger(action: str, role: str, *, user_email: str='', user_id: bson.Objec if groups is not None: updates['groups'] = list(groups) + log.debug('badger(%s, %s, user_email=%s, user_id=%s): applying updates %r', + action, role, user_email, user_id, updates) users_coll.update_one({'_id': db_user['_id']}, {'$set': updates})