archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fix logging in check_home_project_groups CLI command

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-01-26 15:05:49 +01:00
parent de1eab4596
commit e5fb156224
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/cli/maintenance.py
View File

@ -229,19 +229,20 @@ def check_home_project_groups():
good = bad = 0 good = bad = 0
for proj in proj_coll.find({'category': 'home'}): for proj in proj_coll.find({'category': 'home'}):
pid = proj['_id']
try: try:
admin_group_perms = proj['permissions']['groups'][0] admin_group_perms = proj['permissions']['groups'][0]
except IndexError: except IndexError:
log.error('Project %s has no admin group', proj['_id']) log.error('Project %s has no admin group', pid)
return 255 return 255
except KeyError: except KeyError:
log.error('Project %s has no group permissions at all', proj['_id']) log.error('Project %s has no group permissions at all', pid)
return 255 return 255
user = users_coll.find_one({'_id': proj['user']}, user = users_coll.find_one({'_id': proj['user']},
projection={'groups': 1}) projection={'groups': 1})
if user is None: if user is None:
log.error('Project %s has non-existing owner %s', proj['user']) log.error('Project %s has non-existing owner %s', pid, proj['user'])
return 255 return 255
user_groups = set(user['groups']) user_groups = set(user['groups'])
@ -252,7 +253,7 @@ def check_home_project_groups():
continue continue
log.warning('User %s has no admin rights to home project %s -- needs group %s', log.warning('User %s has no admin rights to home project %s -- needs group %s',
proj['user'], proj['_id'], admin_group_id) proj['user'], pid, admin_group_id)
bad += 1 bad += 1
log.info('%i projects OK, %i projects in error', good, bad) log.info('%i projects OK, %i projects in error', good, bad)