mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-01 01:06:59 +00:00
Code Issues Releases Wiki Activity

determine log level from the logger, so it works with logging.conf also

Browse source
This commit is contained in:
Thomas Waldmann 2015-12-12 18:25:38 +01:00
parent f59db03c60
commit 229512b6f5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
borg/remote.py
View file

@ -1,5 +1,6 @@
import errno import errno
import fcntl import fcntl
import logging
import os import os
import select import select
import shlex import shlex
@ -164,12 +165,13 @@ def borg_cmd(self, args, testing):
opts = [] opts = []
if args is not None: if args is not None:
opts.append('--umask=%03o' % args.umask) opts.append('--umask=%03o' % args.umask)
if args.log_level == 'debug': root_logger = logging.getLogger()
if root_logger.isEnabledFor(logging.DEBUG):
opts.append('--debug') opts.append('--debug')
elif args.log_level == 'info': elif root_logger.isEnabledFor(logging.INFO):
opts.append('--info') opts.append('--info')
elif args.log_level == 'warning': elif root_logger.isEnabledFor(logging.WARNING):
pass # is default pass # warning is default
else: else:
raise ValueError('log level missing, fix this code') raise ValueError('log level missing, fix this code')
if testing: if testing:

4
borg/testsuite/repository.py
View file

@ -337,13 +337,11 @@ def test_ssh_cmd(self):
def test_borg_cmd(self): def test_borg_cmd(self):
class MockArgs: class MockArgs:
remote_path = 'borg' remote_path = 'borg'
log_level = 'warning'
umask = 0o077 umask = 0o077
assert self.repository.borg_cmd(None, testing=True) == [sys.executable, '-m', 'borg.archiver', 'serve' ] assert self.repository.borg_cmd(None, testing=True) == [sys.executable, '-m', 'borg.archiver', 'serve' ]
args = MockArgs() args = MockArgs()
assert self.repository.borg_cmd(args, testing=False) == ['borg', 'serve', '--umask=077'] # note: test logger is on info log level, so --info gets added automagically
args.log_level = 'info'
assert self.repository.borg_cmd(args, testing=False) == ['borg', 'serve', '--umask=077', '--info'] assert self.repository.borg_cmd(args, testing=False) == ['borg', 'serve', '--umask=077', '--info']
args.remote_path = 'borg-0.28.2' args.remote_path = 'borg-0.28.2'
assert self.repository.borg_cmd(args, testing=False) == ['borg-0.28.2', 'serve', '--umask=077', '--info'] assert self.repository.borg_cmd(args, testing=False) == ['borg-0.28.2', 'serve', '--umask=077', '--info']