Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/mergin/sync/storages/disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,19 @@ def restore_versioned_file(self, file: str, version: int):
if not (base_meta and diffs):
return

diffs_size = sum(os.path.getsize(d.abs_path) for d in diffs)
logging.info(
f"restore_versioned_file: file={file} target_version={version} "
f"basefile={base_meta.abs_path} basefile_size={base_meta.size} "
f"diffs={len(diffs)} diffs_total_size={diffs_size}"
)

start = time.time()
with self.geodiff_copy(base_meta.abs_path) as restored_file:
copy_time = time.time() - start
logging.info(
f"Restore file: {base_meta.abs_path} copied to {restored_file} in {copy_time} s"
)
logging.info(f"Restoring gpkg file with {len(diffs)} diffs")
try:
self.flush_geodiff_logger() # clean geodiff logger
changeset = os.path.join(
Expand Down
9 changes: 9 additions & 0 deletions server/mergin/sync/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ def create_project_version_zip(version_id: int):
if not project_version:
return

total_files = len(project_version.files)
logging.info(
f"create_project_version_zip: project_id={project_version.project_id} version={project_version.name} "
f"files={total_files} project_size={project_version.project_size}"
)

zip_path = project_version.zip_path + ".partial"
if os.path.exists(zip_path):
mtime = datetime.fromtimestamp(os.path.getmtime(zip_path), tz=timezone.utc)
Expand Down Expand Up @@ -151,6 +157,9 @@ def create_project_version_zip(version_id: int):
)
# move zip file to final location
os.rename(zip_path, project_version.zip_path)
logging.info(
f"create_project_version_zip: finished project_id={project_version.project_id} version={project_version.name}"
)
finally:
# remove partial zip file if exists
if os.path.exists(zip_path):
Expand Down
Loading