Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

deferred_work: Scrub realms with clean_deactivated_realm_data.

Aman Agrawal3e1ac7f3fb00
diff --git a/zerver/worker/deferred_work.py b/zerver/worker/deferred_work.py
index 7928ee38c22..bc55e7cd752 100644
--- a/zerver/worker/deferred_work.py
+++ b/zerver/worker/deferred_work.py
@@ -3,13 +3,12 @@ import logging
import time
from typing import Any
-from django.utils.timezone import now as timezone_now
from typing_extensions import override
from zerver.actions.data_import import import_slack_data
from zerver.actions.message_flags import do_mark_stream_messages_as_read
from zerver.actions.realm_export import handle_realm_export_event
-from zerver.actions.realm_settings import scrub_deactivated_realm
+from zerver.actions.realm_settings import clean_deactivated_realm_data
from zerver.lib.push_notifications import clear_push_device_tokens
from zerver.lib.queue import retry_event
from zerver.lib.remote_server import (
@@ -100,12 +99,7 @@ class DeferredWorker(QueueProcessingWorker):
logger.info("Updating push bouncer with metadata on behalf of realm %s", realm_id)
send_server_data_to_push_bouncer(consider_usage_statistics=False)
elif event["type"] == "scrub_deactivated_realm":
- realms_to_scrub = Realm.objects.filter(
- deactivated=True,
- scheduled_deletion_date__lte=timezone_now(),
- )
- for realm in realms_to_scrub:
- scrub_deactivated_realm(realm)
+ clean_deactivated_realm_data()
elif event["type"] == "import_slack_data":
import_slack_data(event)