diff --git a/app/boot.py b/app/boot.py index e8a5cb6f..699fccaa 100644 --- a/app/boot.py +++ b/app/boot.py @@ -111,12 +111,10 @@ def add_default_presets(): {'name': 'depthmap-resolution', 'value': '1000'}, {'name': 'texturing-nadir-weight', 'value': "28"}]}) Preset.objects.update_or_create(name='Point of Interest', system=True, - defaults={'options': [{'name': 'matcher-neighbors', 'value': "24"}, - {'name': 'mesh-size', 'value': '600000'}, + defaults={'options': [{'name': 'mesh-size', 'value': '600000'}, {'name': 'use-3dmesh', 'value': True}]}) Preset.objects.update_or_create(name='Forest', system=True, defaults={'options': [{'name': 'min-num-features', 'value': "18000"}, - {'name': 'matcher-neighbors', 'value': "21"}, {'name': 'texturing-data-term', 'value': "area"}]}) Preset.objects.update_or_create(name='DSM + DTM', system=True, defaults={ diff --git a/worker/tasks.py b/worker/tasks.py index d31d8b4d..70b09cd7 100644 --- a/worker/tasks.py +++ b/worker/tasks.py @@ -60,6 +60,8 @@ def cleanup_tmp_directory(): @app.task def process_task(taskId): + have_lock = False + try: lock = redis_client.lock('task_lock_{}'.format(taskId)) have_lock = lock.acquire(blocking=False)