diff --git a/zerver/lib/server_initialization.py b/zerver/lib/server_initialization.py index 25bc07fb81..8b9da25ff9 100644 --- a/zerver/lib/server_initialization.py +++ b/zerver/lib/server_initialization.py @@ -7,6 +7,9 @@ from zerver.models import Realm, UserProfile, email_to_username, get_client, \ from typing import Iterable, Optional, Tuple +def server_initialized() -> bool: + return Realm.objects.count() > 0 + def create_internal_realm() -> None: realm = Realm.objects.create(string_id=settings.SYSTEM_BOT_REALM) diff --git a/zerver/management/commands/initialize_voyager_db.py b/zerver/management/commands/initialize_voyager_db.py index 657d9dcf9e..0f7c7100cc 100644 --- a/zerver/management/commands/initialize_voyager_db.py +++ b/zerver/management/commands/initialize_voyager_db.py @@ -4,8 +4,7 @@ from typing import Any from django.conf import settings from django.core.management.base import BaseCommand -from zerver.lib.server_initialization import create_internal_realm -from zerver.models import Realm +from zerver.lib.server_initialization import create_internal_realm, server_initialized settings.TORNADO_SERVER = None @@ -20,7 +19,7 @@ class Command(BaseCommand): help='The number of extra users to create') def handle(self, *args: Any, **options: Any) -> None: - if Realm.objects.count() > 0: + if server_initialized(): print("Database already initialized; doing nothing.") return create_internal_realm()