--- a/RadonMetrics/CodeMetricsCalculator.py Mon Mar 27 18:34:44 2017 +0200 +++ b/RadonMetrics/CodeMetricsCalculator.py Fri Mar 31 17:56:43 2017 +0200 @@ -15,6 +15,7 @@ pass import multiprocessing +import queue def initService(): @@ -86,11 +87,25 @@ # Get and send results endIndex = len(argumentsList) - initialTasks for i in range(len(argumentsList)): - filename, result = doneQueue.get() - send(fx, filename, result) - if cancelled(): + resultSent = False + wasCancelled = False + + while not resultSent: + try: + # get result (waiting max. 3 seconds and send it to frontend + filename, result = doneQueue.get() + send(fx, filename, result) + resultSent = True + except queue.Empty: + # ignore empty queue, just carry on + if cancelled(): + wasCancelled = True + break + + if wasCancelled or cancelled(): # just exit the loop ignoring the results of queued tasks break + if i < endIndex: taskQueue.put(argumentsList[i + initialTasks])