From 83fd1e93369c21712997ce6a13a51f1b024aa727 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 12 Sep 2018 10:42:09 -0400 Subject: [PATCH 1/2] Skip boot code while migrating (speed-up, permission issue fix) --- app/boot.py | 2 +- webodm/settings.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/boot.py b/app/boot.py index 649bfd84..d1742c31 100644 --- a/app/boot.py +++ b/app/boot.py @@ -25,7 +25,7 @@ from webodm.wsgi import booted def boot(): # booted is a shared memory variable to keep track of boot status # as multiple gunicorn workers could trigger the boot sequence twice - if not settings.DEBUG and booted.value: return + if (not settings.DEBUG and booted.value) or settings.MIGRATING: return booted.value = True logger = logging.getLogger('app.logger') diff --git a/webodm/settings.py b/webodm/settings.py index ffdc7ffe..16cd665a 100644 --- a/webodm/settings.py +++ b/webodm/settings.py @@ -45,6 +45,7 @@ with open(os.path.join(BASE_DIR, 'package.json')) as package_file: VERSION = data['version'] TESTING = sys.argv[1:2] == ['test'] +MIGRATING = sys.argv[1:2] == ['migrate'] WORKER_RUNNING = sys.argv[2:3] == ["worker"] # SECURITY WARNING: don't run with debug turned on a public facing server! From bbd38303cf07fe2541135e8ee0d8873e1b01ae1e Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 12 Sep 2018 10:43:16 -0400 Subject: [PATCH 2/2] Updated presets for ODM 0.4 --- app/boot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boot.py b/app/boot.py index d1742c31..e9edcc77 100644 --- a/app/boot.py +++ b/app/boot.py @@ -103,8 +103,8 @@ def add_default_presets(): defaults={'options': [{'name': 'fast-orthophoto', 'value': True}]}) Preset.objects.update_or_create(name='High Resolution', system=True, defaults={'options': [{'name': 'dsm', 'value': True}, - {'name': 'dem-resolution', 'value': "0.04"}, - {'name': 'orthophoto-resolution', 'value': "40"}, + {'name': 'dem-resolution', 'value': "2.5"}, + {'name': 'orthophoto-resolution', 'value': "2.5"}, ]}) Preset.objects.update_or_create(name='Default', system=True, defaults={'options': [{'name': 'dsm', 'value': True}]})