mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

give a final status into the log output, including exit code, fixes #58

This commit is contained in:
Thomas Waldmann 2015-10-20 23:57:56 +02:00
parent 9577121f96
commit 1439f3be60
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
borg/archiver.py
View File

@ -1042,22 +1042,31 @@ def main(): # pragma: no cover
setup_signal_handlers()
archiver = Archiver()
try:
msg = None
exit_code = archiver.run(sys.argv[1:])
except Error as e:
archiver.print_error(e.get_message() + "\n%s" % traceback.format_exc())
msg = e.get_message() + "\n%s" % traceback.format_exc()
exit_code = e.exit_code
except RemoteRepository.RPCError as e:
archiver.print_error('Error: Remote Exception.\n%s' % str(e))
msg = 'Remote Exception.\n%s' % str(e)
exit_code = 1
except Exception:
archiver.print_error('Error: Local Exception.\n%s' % traceback.format_exc())
msg = 'Local Exception.\n%s' % traceback.format_exc()
exit_code = 1
except KeyboardInterrupt:
archiver.print_error('Error: Keyboard interrupt.\n%s' % traceback.format_exc())
msg = 'Keyboard interrupt.\n%s' % traceback.format_exc()
exit_code = 1
if exit_code:
archiver.print_error('Exiting with failure status due to previous errors')
if msg:
logger.error(msg)
if exit_code == 0:
logger.info('terminating with success status, rc %d' % exit_code)
else:
# TODO:
# this should differentiate between normal termination (there were warnings, but
# code reached the end of backup) and abrupt termination due to an error or exception.
logger.error('terminating with failure status due to previous errors, rc %d' % exit_code)
sys.exit(exit_code)
if __name__ == '__main__':
main()