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

sync_project_groups: gracefully handle invalid object IDs.

Browse Source 
Otherwise a mistake at the CLI will create a bugsnag.
This commit is contained in:
Sybren A. Stüvel 2016-07-08 12:08:52 +02:00
parent f6eab4878f
commit 0b8aff1054
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/manage.py
View File

@ -7,7 +7,7 @@ import copy
import os import os
import logging import logging
from bson.objectid import ObjectId from bson.objectid import ObjectId, InvalidId
from eve.methods.put import put_internal from eve.methods.put import put_internal
from eve.methods.post import post_internal from eve.methods.post import post_internal
from flask.ext.script import Manager from flask.ext.script import Manager
@ -983,7 +983,11 @@ def sync_project_groups(user_email, fix):
if '@' in user_email: if '@' in user_email:
where = {'email': user_email} where = {'email': user_email}
else: else:
where = {'_id': ObjectId(user_email)} try:
where = {'_id': ObjectId(user_email)}
except InvalidId:
log.warning('Invalid ObjectID: %s', user_email)
return
user = users_coll.find_one(where, projection={'_id': 1, 'groups': 1}) user = users_coll.find_one(where, projection={'_id': 1, 'groups': 1})
if user is None: if user is None: