r00t2
/
optools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

...

This commit is contained in:
brent s 2017-10-25 16:28:08 -04:00
parent a8914da258
commit 5ab91b01f7
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
storage/backups/borg/backup.py
View File

@ -108,7 +108,7 @@ class Backup(object):
with open(os.devnull, 'w') as DEVNULL: with open(os.devnull, 'w') as DEVNULL:
_err = subprocess.run(cmd, stdout = DEVNULL, stderr = subprocess.PIPE).stderr.decode('utf-8').strip() _err = subprocess.run(cmd, stdout = DEVNULL, stderr = subprocess.PIPE).stderr.decode('utf-8').strip()
if _err != '': if _err != '':
self.logger.error('STDERR: {0} ({1})'.format(_out.stderr.decode('utf-8'), self.logger.error('STDERR: {0} ({1})'.format(_err.stderr.decode('utf-8'),
' '.join(cmd))) ' '.join(cmd)))
return() return()
@ -134,11 +134,14 @@ class Backup(object):
stderr = subprocess.PIPE) stderr = subprocess.PIPE)
_stdout = _out.stdout.decode('utf-8').strip() _stdout = _out.stdout.decode('utf-8').strip()
_stderr = _out.stderr.decode('utf-8').strip() _stderr = _out.stderr.decode('utf-8').strip()
_returncode = _out.returncode
self.logger.debug('[{0}]: (RESULT) {1}'.format(r, _stdout)) self.logger.debug('[{0}]: (RESULT) {1}'.format(r, _stdout))
if _stderr != '': # sigh. borg uses stderr for verbose output.
self.logger.error('[{0}]: STDERR: {1} ({2})'.format(r, self.logger.debug('[{0}]: STDERR: ({2})\n{1}'.format(r,
_stderr, _stderr,
' '.join(_cmd))) ' '.join(_cmd)))
if _returncode != 0:
self.logger.error('[{0}]: FAILED: {1}'.format(r, ' '.join(_cmd)))
del(_env['BORG_PASSPHRASE']) del(_env['BORG_PASSPHRASE'])
self.logger.info('[{0}]: END INITIALIZATION'.format(r)) self.logger.info('[{0}]: END INITIALIZATION'.format(r))
return() return()
@ -179,11 +182,13 @@ class Backup(object):
stderr = subprocess.PIPE) stderr = subprocess.PIPE)
_stdout = _out.stdout.decode('utf-8').strip() _stdout = _out.stdout.decode('utf-8').strip()
_stderr = _out.stderr.decode('utf-8').strip() _stderr = _out.stderr.decode('utf-8').strip()
_returncode = _out.returncode
self.logger.debug('[{0}]: (RESULT) {1}'.format(r, _stdout)) self.logger.debug('[{0}]: (RESULT) {1}'.format(r, _stdout))
if _stderr != '': self.logger.error('[{0}]: STDERR: ({2})\n{1}'.format(r,
self.logger.error('[{0}]: STDERR: {1} ({2})'.format(r, _stderr,
_stderr, ' '.join(_cmd)))
' '.join(_cmd))) if _returncode != 0:
self.logger.error('[{0}]: FAILED: {1}'.format(r, ' '.join(_cmd)))
del(_env['BORG_PASSPHRASE']) del(_env['BORG_PASSPHRASE'])
self.logger.info('[{0}]: END BACKUP'.format(r)) self.logger.info('[{0}]: END BACKUP'.format(r))
self.logger.info('END: backup') self.logger.info('END: backup')