paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

export_usermessage_batch: Use os.rename.

Browse Source 
This avoids an extra stat call to check whether the target is a
directory.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-10-08 19:06:13 -07:00
committed by Tim Abbott
parent 83eca256a4
commit 234f7245cf
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/management/commands/export_usermessage_batch.py
View File

@@ -1,7 +1,6 @@
import glob import glob
import logging import logging
import os import os
import shutil
from argparse import ArgumentParser from argparse import ArgumentParser
from typing import Any from typing import Any
@@ -29,8 +28,8 @@ class Command(BaseCommand):
locked_path = partial_path.replace(".json.partial", ".json.locked") locked_path = partial_path.replace(".json.partial", ".json.locked")
output_path = partial_path.replace(".json.partial", ".json") output_path = partial_path.replace(".json.partial", ".json")
try: try:
shutil.move(partial_path, locked_path) os.rename(partial_path, locked_path)
except Exception: except FileNotFoundError:
# Already claimed by another process # Already claimed by another process
continue continue
logging.info("Thread %s processing %s", options['thread'], output_path) logging.info("Thread %s processing %s", options['thread'], output_path)
@@ -38,5 +37,5 @@ class Command(BaseCommand):
export_usermessages_batch(locked_path, output_path, options["consent_message_id"]) export_usermessages_batch(locked_path, output_path, options["consent_message_id"])
except Exception: except Exception:
# Put the item back in the free pool when we fail # Put the item back in the free pool when we fail
shutil.move(locked_path, partial_path) os.rename(locked_path, partial_path)
raise raise