sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto merge of #401 - pimutils:count-failed-tasks, r=untitaker

Browse source 
CLI worker: Show how many tasks failed

Fix #398
This commit is contained in:
Homu 2016-04-04 06:39:06 +09:00
commit f8a2b109a9
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/cli/test_sync.py
View file

@ -110,7 +110,6 @@ def test_empty_storage(tmpdir, runner):
tmpdir.join('path_b/haha.txt').remove() tmpdir.join('path_b/haha.txt').remove()
result = runner.invoke(['sync']) result = runner.invoke(['sync'])
lines = result.output.splitlines() lines = result.output.splitlines()
assert len(lines) == 2
assert lines[0] == 'Syncing my_pair' assert lines[0] == 'Syncing my_pair'
assert lines[1].startswith('error: my_pair: ' assert lines[1].startswith('error: my_pair: '
'Storage "my_b" was completely emptied.') 'Storage "my_b" was completely emptied.')

19
vdirsyncer/cli/utils.py
View file

@ -4,6 +4,7 @@ import contextlib
import errno import errno
import hashlib import hashlib
import importlib import importlib
import itertools
import json import json
import os import os
import sys import sys
@ -427,10 +428,14 @@ class WorkerQueue(object):
def __init__(self, max_workers): def __init__(self, max_workers):
self._queue = queue.Queue() self._queue = queue.Queue()
self._workers = [] self._workers = []
self._exceptions = []
self._max_workers = max_workers self._max_workers = max_workers
self._shutdown_handlers = [] self._shutdown_handlers = []
# According to http://stackoverflow.com/a/27062830, those are
# threadsafe compared to increasing a simple integer variable.
self.num_done_tasks = itertools.count()
self.num_failed_tasks = itertools.count()
def shutdown(self): def shutdown(self):
while self._shutdown_handlers: while self._shutdown_handlers:
try: try:
@ -447,11 +452,12 @@ class WorkerQueue(object):
try: try:
func(wq=self) func(wq=self)
except Exception as e: except Exception:
handle_cli_error() handle_cli_error()
self._exceptions.append(e) next(self.num_failed_tasks)
finally: finally:
self._queue.task_done() self._queue.task_done()
next(self.num_done_tasks)
if not self._queue.unfinished_tasks: if not self._queue.unfinished_tasks:
self.shutdown() self.shutdown()
@ -484,7 +490,12 @@ class WorkerQueue(object):
for worker in self._workers: for worker in self._workers:
worker.join() worker.join()
if self._exceptions: tasks_failed = next(self.num_failed_tasks)
tasks_done = next(self.num_done_tasks)
if tasks_failed > 0:
cli_logger.error('{} out of {} tasks failed.'
.format(tasks_failed, tasks_done))
sys.exit(1) sys.exit(1)
def put(self, f): def put(self, f):