From f545ebbf0dd3990998534daddcddb5b01ed396de Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 24 Nov 2025 17:45:52 +0100 Subject: [PATCH] fuse2: optimize/generalize debug and test logging --- src/borg/fuse2.py | 12 +++++++----- src/borg/testsuite/archiver/mount2_cmds_test.py | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/borg/fuse2.py b/src/borg/fuse2.py index bd4028b83..f2d2b111b 100644 --- a/src/borg/fuse2.py +++ b/src/borg/fuse2.py @@ -1,3 +1,4 @@ +import datetime import errno import hashlib import os @@ -27,14 +28,15 @@ from .platformflags import is_darwin from .repository import Repository from .remote import RemoteRepository +DEBUG_LOG = None # os.path.join(os.getcwd(), "fuse_debug.log") + def debug_log(msg): """Append debug message to fuse_debug.log""" - import datetime - - timestamp = datetime.datetime.now().strftime("%H:%M:%S.%f")[:-3] - with open("/Users/tw/w/borg_ag/fuse_debug.log", "a") as f: - f.write(f"{timestamp} {msg}\n") + if DEBUG_LOG: + timestamp = datetime.datetime.now().strftime("%H:%M:%S.%f")[:-3] + with open(DEBUG_LOG, "a") as f: + f.write(f"{timestamp} {msg}\n") def fuse_main(): diff --git a/src/borg/testsuite/archiver/mount2_cmds_test.py b/src/borg/testsuite/archiver/mount2_cmds_test.py index a1e717052..29b1c9245 100644 --- a/src/borg/testsuite/archiver/mount2_cmds_test.py +++ b/src/borg/testsuite/archiver/mount2_cmds_test.py @@ -119,7 +119,7 @@ def fuse_mount2(archiver, mountpoint, *args, **kwargs): # For debugging, let's inherit stderr # p = subprocess.Popen(full_cmd, env=env, stdout=subprocess.PIPE, stderr=None) - log_file_path = "/Users/tw/w/borg_ag/mount2.log" + log_file_path = os.path.join(os.getcwd(), "mount2.log") log_file = open(log_file_path, "w") p = subprocess.Popen(full_cmd, env=env, stdout=log_file, stderr=log_file)