ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-12 16:02:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do more null checks

Browse Source
This commit is contained in:
Sajith Sasidharan 2020-07-10 06:56:29 -04:00
parent dfb477a2b1
commit 427f99621f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/allmydata/web/check_results.py
View File

@ -671,9 +671,13 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def root_storage_index(self, req, tag): def root_storage_index(self, req, tag):
if not self.monitor.get_status():
return ""
return self.monitor.get_status().get_root_storage_index_string() return self.monitor.get_status().get_root_storage_index_string()
def _get_counter(self, name): def _get_counter(self, name):
if not self.monitor.get_status():
return ""
return str(self.monitor.get_status().get_counters().get(name)) return str(self.monitor.get_status().get_counters().get(name))
@renderer @renderer
@ -718,8 +722,7 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def pre_repair_problems_p(self, req, tag): def pre_repair_problems_p(self, req, tag):
c = self.monitor.get_status().get_counters() if self._get_counter("count-objects-unhealthy-pre-repair"):
if c["count-objects-unhealthy-pre-repair"]:
return tag return tag
return "" return ""
@ -740,9 +743,8 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def post_repair_problems_p(self, req, tag): def post_repair_problems_p(self, req, tag):
c = self.monitor.get_status().get_counters() if (self._get_counter("count-objects-unhealthy-post-repair")
if (c["count-objects-unhealthy-post-repair"] or self._get_counter("count-corrupt-shares-post-repair")):
or c["count-corrupt-shares-post-repair"]):
return tag return tag
return "" return ""
@ -763,7 +765,7 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def servers_with_corrupt_shares_p(self, req, tag): def servers_with_corrupt_shares_p(self, req, tag):
if self.monitor.get_status().get_counters()["count-corrupt-shares-pre-repair"]: if self._get_counter("count-corrupt-shares-pre-repair"):
return tag return tag
return "" return ""
@ -776,7 +778,7 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def remaining_corrupt_shares_p(self, req, tag): def remaining_corrupt_shares_p(self, req, tag):
if self.monitor.get_status().get_counters()["count-corrupt-shares-post-repair"]: if self._get_counter("count-corrupt-shares-post-repair"):
return tag return tag
return "" return ""
@ -796,7 +798,9 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def all_objects(self, req, tag): def all_objects(self, req, tag):
results = self.monitor.get_status().get_all_results() results = {}
if self.monitor.get_status():
results = self.monitor.get_status().get_all_results()
objects = [] objects = []
for path in sorted(results.keys()): for path in sorted(results.keys()):
@ -816,5 +820,7 @@ class DeepCheckAndRepairResultsRendererElement(Element, ResultsBase, ReloadMixin
@renderer @renderer
def runtime(self, req, tag): def runtime(self, req, tag):
runtime = time.time() - req.processing_started_timestamp runtime = 'unknown'
if hasattr(req, 'processing_started_timestamp'):
runtime = time.time() - req.processing_started_timestamp
return tag("runtime: %s seconds" % runtime) return tag("runtime: %s seconds" % runtime)