diff --git a/zerver/lib/email_mirror.py b/zerver/lib/email_mirror.py index 32d54ec16a..4692bfe035 100644 --- a/zerver/lib/email_mirror.py +++ b/zerver/lib/email_mirror.py @@ -56,7 +56,7 @@ def log_and_report(email_message, error_message, debug_info): scrubbed_error) if "stream" in debug_info: - scrubbed_error = u"Realm: %s\n%s" % (debug_info["stream"].realm.domain, + scrubbed_error = u"Realm: %s\n%s" % (debug_info["stream"].realm.string_id, scrubbed_error) logger.error(scrubbed_error) @@ -313,7 +313,7 @@ def process_stream_message(to, subject, message, debug_info): debug_info["stream"] = stream send_zulip(settings.EMAIL_GATEWAY_BOT, stream, subject, body) logging.info("Successfully processed email to %s (%s)" % ( - stream.name, stream.realm.domain)) + stream.name, stream.realm.string_id)) def process_missed_message(to, message, pre_checked): # type: (Text, message.Message, bool) -> None diff --git a/zerver/lib/export.py b/zerver/lib/export.py index 6de3eb4308..f0f0209fce 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -1067,7 +1067,7 @@ def do_export_realm(realm, output_dir, threads, exportable_user_ids=None): # Start parallel jobs to export the UserMessage objects. launch_user_message_subprocesses(threads=threads, output_dir=output_dir) - logging.info("Finished exporting %s" % (realm.domain)) + logging.info("Finished exporting %s" % (realm.string_id)) create_soft_link(source=output_dir, in_progress=False) def export_attachment_table(realm, output_dir, message_ids):