Browse Source

use new logger object initialisation code

Antoine Beaupré 9 years ago
parent
commit
42cc17caed
5 changed files with 9 additions and 10 deletions
  1. 3 1
      borg/archive.py
  2. 2 3
      borg/archiver.py
  3. 2 2
      borg/cache.py
  4. 0 2
      borg/helpers.py
  5. 2 2
      borg/key.py

+ 3 - 1
borg/archive.py

@@ -4,10 +4,12 @@ from getpass import getuser
 from itertools import groupby
 import errno
 import logging
-logger = logging.getLogger(__name__)
 
+from .logger import create_logger
+logger = create_logger()
 from .key import key_factory
 from .remote import cache_if_remote
+
 import msgpack
 import os
 import socket

+ 2 - 3
borg/archiver.py

@@ -7,8 +7,6 @@ from operator import attrgetter
 import functools
 import inspect
 import io
-import logging
-logger = logging.getLogger(__name__)
 
 import os
 import signal
@@ -20,7 +18,8 @@ import traceback
 from . import __version__
 from .archive import Archive, ArchiveChecker, CHUNKER_PARAMS
 from .compress import Compressor, COMPR_BUFFER
-from .logger import setup_logging
+from .logger import create_logger, setup_logging
+logger = create_logger()
 from .upgrader import AtticRepositoryUpgrader
 from .repository import Repository
 from .cache import Cache

+ 2 - 2
borg/cache.py

@@ -2,8 +2,6 @@ import configparser
 from .remote import cache_if_remote
 from collections import namedtuple
 import errno
-import logging
-logger = logging.getLogger(__name__)
 
 import msgpack
 import os
@@ -15,6 +13,8 @@ import tarfile
 import tempfile
 
 from .key import PlaintextKey
+from .logger import create_logger
+logger = create_logger()
 from .helpers import Error, get_cache_dir, decode_dict, st_mtime_ns, unhexlify, int_to_bigint, \
     bigint_to_int, format_file_size
 from .locking import UpgradableLock

+ 0 - 2
borg/helpers.py

@@ -5,8 +5,6 @@ import binascii
 from collections import namedtuple
 from functools import wraps
 import grp
-import logging
-logger = logging.getLogger(__name__)
 
 import os
 import pwd

+ 2 - 2
borg/key.py

@@ -1,8 +1,6 @@
 from binascii import hexlify, a2b_base64, b2a_base64
 import configparser
 import getpass
-import logging
-logger = logging.getLogger(__name__)
 
 import os
 import msgpack
@@ -13,6 +11,8 @@ from hashlib import sha256
 from .crypto import pbkdf2_sha256, get_random_bytes, AES, bytes_to_long, long_to_bytes, bytes_to_int, num_aes_blocks
 from .compress import Compressor, COMPR_BUFFER
 from .helpers import IntegrityError, get_keys_dir, Error
+from .logger import create_logger
+logger = create_logger()
 
 PREFIX = b'\0' * 8