kopia lustrzana https://github.com/OpenDroneMap/WebODM
Reverted sleep to 30, caught boot code that cannot run during migration
rodzic
07aa8e0b4a
commit
4923a507c9
|
@ -18,6 +18,6 @@ before_install:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- docker-compose up --build -d
|
- docker-compose up --build -d
|
||||||
- sleep 60
|
- sleep 30
|
||||||
|
|
||||||
script: docker-compose exec webapp python manage.py test
|
script: docker-compose exec webapp python manage.py test
|
||||||
|
|
|
@ -2,12 +2,14 @@ def boot():
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
from django.contrib.auth.models import User, Group
|
from django.contrib.auth.models import User, Group
|
||||||
|
from django.db.utils import ProgrammingError
|
||||||
from . import signals
|
from . import signals
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
logger = logging.getLogger('app.logger')
|
logger = logging.getLogger('app.logger')
|
||||||
|
|
||||||
# Check default group
|
# Check default group
|
||||||
|
try:
|
||||||
default_group, created = Group.objects.get_or_create(name='Default')
|
default_group, created = Group.objects.get_or_create(name='Default')
|
||||||
if created:
|
if created:
|
||||||
logger.info("Created default group")
|
logger.info("Created default group")
|
||||||
|
@ -22,3 +24,5 @@ def boot():
|
||||||
if User.objects.count() == 0:
|
if User.objects.count() == 0:
|
||||||
User.objects.create_superuser('admin', 'admin@example.com', 'admin')
|
User.objects.create_superuser('admin', 'admin@example.com', 'admin')
|
||||||
logger.info("Created superuser")
|
logger.info("Created superuser")
|
||||||
|
except ProgrammingError:
|
||||||
|
logger.warn("Could not create default group/user. If running a migration, this is expected.")
|
||||||
|
|
Ładowanie…
Reference in New Issue