flifloo/BackupPC_archive_host_B2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change "logging" to "logger" throughout

Browse source
This commit is contained in:
Ryan Tucker 2011-09-20 22:22:56 -04:00
parent c4cb3c8a7f
commit 3af02240a4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
BackupPC_archiveHost_s3
View file

@ -185,10 +185,10 @@ def encrypt_file(filename, key, compress='/bin/cat'):
cmd.extend(['--symmetric', filename]) cmd.extend(['--symmetric', filename])
if is_exe(cmd[0]): if is_exe(cmd[0]):
logging.info('Encrypting %s (compression: %s)' % (filename, compress_algo)) logger.info('Encrypting %s (compression: %s)' % (filename, compress_algo))
logging.debug(`cmd`) logger.debug(`cmd`)
else: else:
logging.error('%s is not an executable file!' % cmd[0]) logger.error('%s is not an executable file!' % cmd[0])
proc = Popen(cmd, stdin=PIPE, stdout=PIPE) proc = Popen(cmd, stdin=PIPE, stdout=PIPE)
proc.communicate(key) proc.communicate(key)
@ -197,11 +197,11 @@ def encrypt_file(filename, key, compress='/bin/cat'):
oldfilesize = os.path.getsize(filename) oldfilesize = os.path.getsize(filename)
newfilesize = os.path.getsize(filename + '.gpg') newfilesize = os.path.getsize(filename + '.gpg')
compressed = ((oldfilesize - newfilesize) / float(oldfilesize)) * 100 compressed = ((oldfilesize - newfilesize) / float(oldfilesize)) * 100
logging.info('%s shrunk by %.2f%% (%i -> %i bytes)' % (filename, compressed, oldfilesize, newfilesize)) logger.info('%s shrunk by %.2f%% (%i -> %i bytes)' % (filename, compressed, oldfilesize, newfilesize))
os.unlink(filename) os.unlink(filename)
return filename + '.gpg' return filename + '.gpg'
else: else:
logging.error('%s.gpg does not exist' % filename) logger.error('%s.gpg does not exist' % filename)
raise Exception raise Exception
def open_s3(accesskey, sharedkey, host): def open_s3(accesskey, sharedkey, host):
@ -271,7 +271,7 @@ if __name__ == '__main__':
if secrets.gpgsymmetrickey: if secrets.gpgsymmetrickey:
mesg += ', encrypted with secret key' mesg += ', encrypted with secret key'
logging.info(mesg) logger.info(mesg)
sys.stdout.write(time.strftime('%d-%H:%M:%S') + ": " + mesg + '\n') sys.stdout.write(time.strftime('%d-%H:%M:%S') + ": " + mesg + '\n')
sys.stdout.flush() sys.stdout.flush()
@ -292,7 +292,7 @@ if __name__ == '__main__':
# is there already evidence of this having been done before? # is there already evidence of this having been done before?
if glob.glob('%s/%s.*.tar.*' % (outLoc, host)): if glob.glob('%s/%s.*.tar.*' % (outLoc, host)):
logging.info('Evidence of failed execution run prior! Finishing it.') logger.info('Evidence of failed execution run prior! Finishing it.')
somefile = os.path.basename(glob.glob('%s/%s.*.tar.*' % (outLoc, host))[0]) somefile = os.path.basename(glob.glob('%s/%s.*.tar.*' % (outLoc, host))[0])
keyparts = somefile.split('.') keyparts = somefile.split('.')
encrypted = split = tarred = final = False encrypted = split = tarred = final = False
@ -314,11 +314,11 @@ if __name__ == '__main__':
if secrets.gpgsymmetrickey: if secrets.gpgsymmetrickey:
mesg += ', encrypted with secret key' mesg += ', encrypted with secret key'
logging.info(mesg) logger.info(mesg)
sys.stdout.write(time.strftime('%d-%H:%M:%S') + ": " + mesg + '\n') sys.stdout.write(time.strftime('%d-%H:%M:%S') + ": " + mesg + '\n')
sys.stdout.flush() sys.stdout.flush()
else: else:
logging.debug('Executing %s' % cmd) logger.debug('Executing %s' % cmd)
returncode = os.system(cmd) returncode = os.system(cmd)