storage status: report expiration-cutoff-date like 19-Mar-2009 (as opposed to the tahoe.cfg input format of 2009-03-19), for redundancy: someone who gets the month and day switched will have a better chance to spot the problem in the storage-status output if it's in a different format

This commit is contained in:
Brian Warner 2009-03-19 11:07:56 -07:00
parent f0071c2571
commit 186b6a8c01
2 changed files with 2 additions and 2 deletions

View File

@ -2020,7 +2020,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("Expiration Enabled:" self.failUnlessIn("Expiration Enabled:"
" expired leases will be removed", s) " expired leases will be removed", s)
date = time.strftime("%Y-%m-%d", time.gmtime(then)) date = time.strftime("%d-%b-%Y", time.gmtime(then))
self.failUnlessIn("Leases created or last renewed before %s" self.failUnlessIn("Leases created or last renewed before %s"
" will be considered expired." % date, s) " will be considered expired." % date, s)
self.failUnlessIn(" recovered: 2 shares, 2 buckets (1 mutable / 1 immutable), ", s) self.failUnlessIn(" recovered: 2 shares, 2 buckets (1 mutable / 1 immutable), ", s)

View File

@ -139,7 +139,7 @@ class StorageStatus(rend.Page):
% abbreviate_time(lc.override_lease_duration)] % abbreviate_time(lc.override_lease_duration)]
else: else:
assert lc.mode == "cutoff-date" assert lc.mode == "cutoff-date"
date = time.strftime("%Y-%m-%d", time.gmtime(lc.cutoff_date)) date = time.strftime("%d-%b-%Y", time.gmtime(lc.cutoff_date))
ctx.tag["Leases created or last renewed before %s " ctx.tag["Leases created or last renewed before %s "
"will be considered expired." % date] "will be considered expired." % date]
if len(lc.mode) > 2: if len(lc.mode) > 2: