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

fixing an infinite-pause error; sending some output to stdout to avoid timeouts

Browse source
This commit is contained in:
Ryan Tucker 2010-01-01 13:59:54 -05:00
parent 5fe7494f15
commit e80b23e036
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
BackupPC_archiveHost_s3
View file

@ -74,7 +74,7 @@ class SlowFile:
self.encoding = None self.encoding = None
self.delayfactor = 1 self.delayfactor = 1
self.lastblocktargettime = 2**31 self.lastblocktargettime = 0
self.lastdebug = 0 self.lastdebug = 0
@ -103,7 +103,10 @@ class SlowFile:
starttime = time.time() starttime = time.time()
if starttime < self.lastblocktargettime: if self.lastblocktargettime == 0:
# first time through
pass
elif starttime < self.lastblocktargettime:
# we're early # we're early
sleepfor = self.lastblocktargettime - starttime sleepfor = self.lastblocktargettime - starttime
time.sleep(sleepfor) time.sleep(sleepfor)
@ -243,7 +246,8 @@ if secrets.gpgsymmetrickey:
mesg += ', encrypted with secret key' mesg += ', encrypted with secret key'
logging.info(mesg) logging.info(mesg)
print mesg sys.stdout.write(mesg + '\n')
sys.stdout.flush()
# Prepare the pipeline # Prepare the pipeline
if share == '*': if share == '*':
@ -280,6 +284,10 @@ for i in sorted(glob.glob(fileglob)):
# either encryption is off, or the file is already encrypted # either encryption is off, or the file is already encrypted
sendfile = i sendfile = i
# create some output so backuppc doesn't time out
sys.stdout.write("%s: Sending %s to S3...\n" % (time.strftime('%d-%H:%M:%S'), sendfile))
sys.stdout.flush()
retry_count = 0 retry_count = 0
max_retries = 10 max_retries = 10