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

remote: clarify remote log handling comments

Browse source
This commit is contained in:
Marian Beermann 2017-05-20 12:52:32 +02:00
parent 5f4d97ff2b
commit b3b555395c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/borg/remote.py
View file

@ -935,7 +935,7 @@ def handle_remote_line(line):
""" """
Handle a remote log line. Handle a remote log line.
This function is remarkably complex because it handles three different wire formats. This function is remarkably complex because it handles multiple wire formats.
""" """
if line.startswith('{'): if line.startswith('{'):
# This format is used by Borg since 1.1.0b6 for new-protocol clients. # This format is used by Borg since 1.1.0b6 for new-protocol clients.
@ -951,9 +951,9 @@ def handle_remote_line(line):
level = getattr(logging, msg['levelname'], logging.CRITICAL) level = getattr(logging, msg['levelname'], logging.CRITICAL)
assert isinstance(level, int) assert isinstance(level, int)
target_logger = logging.getLogger(msg['name']) target_logger = logging.getLogger(msg['name'])
# We manually check whether the log message should be propagated
msg['message'] = 'Remote: ' + msg['message'] msg['message'] = 'Remote: ' + msg['message']
if level >= target_logger.getEffectiveLevel() and logging.getLogger('borg').json: # In JSON mode, we manually check whether the log message should be propagated.
if logging.getLogger('borg').json and level >= target_logger.getEffectiveLevel():
sys.stderr.write(json.dumps(msg) + '\n') sys.stderr.write(json.dumps(msg) + '\n')
else: else:
target_logger.log(level, '%s', msg['message']) target_logger.log(level, '%s', msg['message'])
@ -967,8 +967,8 @@ def handle_remote_line(line):
# When progress output is enabled, we check whether the client is in # When progress output is enabled, we check whether the client is in
# --log-json mode, as signalled by the "json" attribute on the "borg" logger. # --log-json mode, as signalled by the "json" attribute on the "borg" logger.
if logging.getLogger('borg').json: if logging.getLogger('borg').json:
# In --log-json mode we re-emit the progress JSON line as sent by the server, prefixed # In --log-json mode we re-emit the progress JSON line as sent by the server,
# with "Remote: " when it contains a message. # with the message, if any, prefixed with "Remote: ".
if 'message' in msg: if 'message' in msg:
msg['message'] = 'Remote: ' + msg['message'] msg['message'] = 'Remote: ' + msg['message']
sys.stderr.write(json.dumps(msg) + '\n') sys.stderr.write(json.dumps(msg) + '\n')
@ -988,6 +988,7 @@ def handle_remote_line(line):
# it readable with older (1.0.x) clients. # it readable with older (1.0.x) clients.
# #
# TODO: Remove this block (so it'll be handled by the "else:" below) with a Borg 1.1 RC. # TODO: Remove this block (so it'll be handled by the "else:" below) with a Borg 1.1 RC.
# Also check whether client_supports_log_v3 should be removed.
_, level, msg = line.split(' ', 2) _, level, msg = line.split(' ', 2)
level = getattr(logging, level, logging.CRITICAL) # str -> int level = getattr(logging, level, logging.CRITICAL) # str -> int
if msg.startswith('Remote:'): if msg.startswith('Remote:'):