Browse Source

always setup module level "logger" in the same way

this is a cleanup change, found this while trying to find out why
borg_cmd spuriously does not have INFO loglevel when testing with
pytest-xdist.

the cleanup did NOT help with this, but is at least a cleanup.
Thomas Waldmann 8 năm trước cách đây
mục cha
commit
a1d223cec0
2 tập tin đã thay đổi với 7 bổ sung5 xóa
  1. 4 3
      borg/repository.py
  2. 3 2
      borg/upgrader.py

+ 4 - 3
borg/repository.py

@@ -3,15 +3,16 @@ from binascii import unhexlify
 from datetime import datetime
 from datetime import datetime
 from itertools import islice
 from itertools import islice
 import errno
 import errno
-import logging
-logger = logging.getLogger(__name__)
-
 import os
 import os
 import shutil
 import shutil
 import struct
 import struct
 from zlib import crc32
 from zlib import crc32
 
 
 import msgpack
 import msgpack
+
+from .logger import create_logger
+logger = create_logger()
+
 from .helpers import Error, ErrorWithTraceback, IntegrityError, Location, ProgressIndicatorPercent, bin_to_hex
 from .helpers import Error, ErrorWithTraceback, IntegrityError, Location, ProgressIndicatorPercent, bin_to_hex
 from .hashindex import NSIndex
 from .hashindex import NSIndex
 from .locking import Lock, LockError, LockErrorT
 from .locking import Lock, LockError, LockErrorT

+ 3 - 2
borg/upgrader.py

@@ -1,10 +1,11 @@
 import datetime
 import datetime
-import logging
-logger = logging.getLogger(__name__)
 import os
 import os
 import shutil
 import shutil
 import time
 import time
 
 
+from .logger import create_logger
+logger = create_logger()
+
 from .helpers import get_keys_dir, get_cache_dir, ProgressIndicatorPercent, bin_to_hex
 from .helpers import get_keys_dir, get_cache_dir, ProgressIndicatorPercent, bin_to_hex
 from .locking import Lock
 from .locking import Lock
 from .repository import Repository, MAGIC
 from .repository import Repository, MAGIC