paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-20 14:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

import_realm: Keep the realm deactivated until import is complete.

Browse Source
This commit is contained in:
Alex Vandiver
2023-04-03 14:05:22 +00:00
committed by Tim Abbott
parent 5c6f842b28
commit 4b0b8abc6c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/lib/import_realm.py
View File

@@ -958,7 +958,11 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
fix_realm_authentication_bitfield(data, "zerver_realm", "authentication_methods") fix_realm_authentication_bitfield(data, "zerver_realm", "authentication_methods")
update_model_ids(Realm, data, "realm") update_model_ids(Realm, data, "realm")
realm = Realm(**data["zerver_realm"][0]) # Create the realm, but mark it deactivated for now, while we
# import the supporting data structures, which may take a bit.
realm_properties = dict(**data["zerver_realm"][0])
realm_properties["deactivated"] = True
realm = Realm(**realm_properties)
if realm.notifications_stream_id is not None: if realm.notifications_stream_id is not None:
notifications_stream_id: Optional[int] = int(realm.notifications_stream_id) notifications_stream_id: Optional[int] = int(realm.notifications_stream_id)
@@ -1365,9 +1369,9 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
logging.info("Importing attachment data from %s", fn) logging.info("Importing attachment data from %s", fn)
with open(fn, "rb") as f: with open(fn, "rb") as f:
data = orjson.loads(f.read()) attachment_data = orjson.loads(f.read())
import_attachments(data) import_attachments(attachment_data)
# Import the analytics file. # Import the analytics file.
import_analytics_data(realm=realm, import_dir=import_dir) import_analytics_data(realm=realm, import_dir=import_dir)
@@ -1376,6 +1380,11 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
do_change_realm_plan_type(realm, Realm.PLAN_TYPE_LIMITED, acting_user=None) do_change_realm_plan_type(realm, Realm.PLAN_TYPE_LIMITED, acting_user=None)
else: else:
do_change_realm_plan_type(realm, Realm.PLAN_TYPE_SELF_HOSTED, acting_user=None) do_change_realm_plan_type(realm, Realm.PLAN_TYPE_SELF_HOSTED, acting_user=None)
# Activate the realm
realm.deactivated = data["zerver_realm"][0]["deactivated"]
realm.save()
return realm return realm