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

Orphan finder: when iterating all projects, gracefully stop at CTRL+C

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-09-13 10:20:52 +02:00
parent 5ce02bbbfe
commit 4be05c8b57
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/cli/maintenance.py
View File

@ -605,9 +605,13 @@ def find_orphan_files(proj_url):
if proj_url == 'all': if proj_url == 'all':
log.warning('Iterating over ALL projects, may take a while') log.warning('Iterating over ALL projects, may take a while')
orphans = set() orphans = set()
try:
for project in projects_coll.find({'_deleted': {'$ne': True}}, projection={'_id': 1}): for project in projects_coll.find({'_deleted': {'$ne': True}}, projection={'_id': 1}):
proj_orphans = _find_orphan_files(project['_id']) proj_orphans = _find_orphan_files(project['_id'])
orphans.update(proj_orphans) orphans.update(proj_orphans)
except KeyboardInterrupt:
log.warning('Keyboard interrupt received, stopping now '
'and showing intermediary results.')
else: else:
project = projects_coll.find_one({'url': proj_url}, projection={'_id': 1}) project = projects_coll.find_one({'url': proj_url}, projection={'_id': 1})
if not project: if not project: