mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #518 from pierotofy/improvements 

Better migrations, changed default presets
pull/521/head
Piero Toffanin 2018-09-12 11:17:53 -04:00 zatwierdzone przez GitHub
rodzic 14b6a355e2 bbd38303cf
commit e83a7f79ee
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/boot.py
Wyświetl plik

@ -25,7 +25,7 @@ from webodm.wsgi import booted
def boot(): def boot():
# booted is a shared memory variable to keep track of boot status # booted is a shared memory variable to keep track of boot status
# as multiple gunicorn workers could trigger the boot sequence twice # 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 booted.value = True
logger = logging.getLogger('app.logger') logger = logging.getLogger('app.logger')
@ -103,8 +103,8 @@ def add_default_presets():
defaults={'options': [{'name': 'fast-orthophoto', 'value': True}]}) defaults={'options': [{'name': 'fast-orthophoto', 'value': True}]})
Preset.objects.update_or_create(name='High Resolution', system=True, Preset.objects.update_or_create(name='High Resolution', system=True,
defaults={'options': [{'name': 'dsm', 'value': True}, defaults={'options': [{'name': 'dsm', 'value': True},
{'name': 'dem-resolution', 'value': "0.04"}, {'name': 'dem-resolution', 'value': "2.5"},
{'name': 'orthophoto-resolution', 'value': "40"}, {'name': 'orthophoto-resolution', 'value': "2.5"},
]}) ]})
Preset.objects.update_or_create(name='Default', system=True, Preset.objects.update_or_create(name='Default', system=True,
defaults={'options': [{'name': 'dsm', 'value': True}]}) defaults={'options': [{'name': 'dsm', 'value': True}]})

1
webodm/settings.py
Wyświetl plik

@ -45,6 +45,7 @@ with open(os.path.join(BASE_DIR, 'package.json')) as package_file:
VERSION = data['version'] VERSION = data['version']
TESTING = sys.argv[1:2] == ['test'] TESTING = sys.argv[1:2] == ['test']
MIGRATING = sys.argv[1:2] == ['migrate']
WORKER_RUNNING = sys.argv[2:3] == ["worker"] WORKER_RUNNING = sys.argv[2:3] == ["worker"]
# SECURITY WARNING: don't run with debug turned on a public facing server! # SECURITY WARNING: don't run with debug turned on a public facing server!