Merging with upstream

This commit is contained in:
Andrew Melton 2013-04-02 14:11:53 -04:00
commit 13a8e32a60

View File

@ -58,9 +58,10 @@ def add_past_usage(raws):
if processed % 50 == 0: if processed % 50 == 0:
next_update = last_update + datetime.timedelta(seconds=30) next_update = last_update + datetime.timedelta(seconds=30)
if datetime.datetime.utcnow() > next_update: if datetime.datetime.utcnow() > next_update:
values = (processed, count - processed, m = (processed, count - processed,
(float(processed) / count) * 100) (float(processed) / count)*100)
print "%s processed, %s to go, %.2f percent done" % values print "%s processed, %s to go, %.2f percent done" % m
last_update = datetime.datetime.utcnow()
print "completed processing %s events" % count print "completed processing %s events" % count