mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-30 19:21:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #838 from enkore/issue/792

Browse source 
Remote: don't print tracebacks for Error exceptions handled downstream
This commit is contained in:
TW 2016-04-04 21:37:04 +02:00
commit 9a7bad295c
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
borg/remote.py
View file

@ -82,6 +82,7 @@ def serve(self):
unpacker.feed(data)
for unpacked in unpacker:
if not (isinstance(unpacked, tuple) and len(unpacked) == 4):
self.repository.close()
raise Exception("Unexpected RPC data format.")
type, msgid, method, args = unpacked
method = method.decode('ascii')
@ -94,8 +95,12 @@ def serve(self):
f = getattr(self.repository, method)
res = f(*args)
except BaseException as e:
logging.exception('Borg %s: exception in RPC call:', __version__)
logging.error(sysinfo())
# These exceptions are reconstructed on the client end in RemoteRepository.call_many(),
# and will be handled just like locally raised exceptions. Suppress the remote traceback
# for these, except ErrorWithTraceback, which should always display a traceback.
if not isinstance(e, (Repository.DoesNotExist, Repository.AlreadyExists, PathNotAllowed)):
logging.exception('Borg %s: exception in RPC call:', __version__)
logging.error(sysinfo())
exc = "Remote Exception (see remote log for the traceback)"
os.write(stdout_fd, msgpack.packb((1, msgid, e.__class__.__name__, exc)))
else:
@ -164,7 +169,11 @@ def __init__(self, location, create=False, lock_wait=None, lock=True, args=None)
raise ConnectionClosedWithHint('Is borg working on the server?') from None
if version != RPC_PROTOCOL_VERSION:
raise Exception('Server insisted on using unsupported protocol version %d' % version)
self.id = self.call('open', location.path, create, lock_wait, lock)
try:
self.id = self.call('open', self.location.path, create, lock_wait, lock)
except Exception:
self.close()
raise
def __del__(self):
if self.p: