ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 09:48:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant None-checks on self.storage

Browse Source 
When no storage is up, `storage_running()` renderer will return a big
honking `no storage server running` message, and no further renderers
will be invoked.  Therefore the extra defense is probably not
required.

(I tested this hypothesis.  The extra defense is not required, unless
there's something I have not seen.)
This commit is contained in:
Sajith Sasidharan 2020-02-13 17:18:37 -05:00
parent c061f6830e
commit aab940f65f
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/allmydata/web/storage.py
View File

@ -42,8 +42,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def nodeid(self, req, tag): def nodeid(self, req, tag):
if self.storage is None:
return tag("No storage server running.")
return idlib.nodeid_b2a(self.storage.my_nodeid) return idlib.nodeid_b2a(self.storage.my_nodeid)
def _get_storage_stat(self, key): def _get_storage_stat(self, key):
@ -71,8 +69,6 @@ class StorageStatusElement(Element):
:param str key: storage server statistic we want to know. :param str key: storage server statistic we want to know.
""" """
if not self.storage:
return None
return self.storage.get_stats().get(key) return self.storage.get_stats().get(key)
def render_abbrev_space(self, size): def render_abbrev_space(self, size):
@ -152,8 +148,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def last_complete_bucket_count(self, req, tag): def last_complete_bucket_count(self, req, tag):
if not self.storage:
return tag("No storage server running.")
s = self.storage.bucket_counter.get_state() s = self.storage.bucket_counter.get_state()
count = s.get("last-complete-bucket-count") count = s.get("last-complete-bucket-count")
if count is None: if count is None:
@ -162,8 +156,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def count_crawler_status(self, req, tag): def count_crawler_status(self, req, tag):
if not self.storage:
return tag("No storage server running.")
p = self.storage.bucket_counter.get_progress() p = self.storage.bucket_counter.get_progress()
return self.format_crawler_progress(p) return self.format_crawler_progress(p)
@ -200,8 +192,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def lease_expiration_enabled(self, req, tag): def lease_expiration_enabled(self, req, tag):
if not self.storage:
return tag("No storage server running.")
lc = self.storage.lease_checker lc = self.storage.lease_checker
if lc.expiration_enabled: if lc.expiration_enabled:
return tag("Enabled: expired leases will be removed") return tag("Enabled: expired leases will be removed")
@ -210,8 +200,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def lease_expiration_mode(self, req, tag): def lease_expiration_mode(self, req, tag):
if not self.storage:
return tag("No storage server running.")
lc = self.storage.lease_checker lc = self.storage.lease_checker
if lc.mode == "age": if lc.mode == "age":
if lc.override_lease_duration is None: if lc.override_lease_duration is None:
@ -235,16 +223,12 @@ class StorageStatusElement(Element):
@renderer @renderer
def lease_current_cycle_progress(self, req, tag): def lease_current_cycle_progress(self, req, tag):
if not self.storage:
return tag("No storage server running.")
lc = self.storage.lease_checker lc = self.storage.lease_checker
p = lc.get_progress() p = lc.get_progress()
return tag(self.format_crawler_progress(p)) return tag(self.format_crawler_progress(p))
@renderer @renderer
def lease_current_cycle_results(self, req, tag): def lease_current_cycle_results(self, req, tag):
if not self.storage:
return tag("No storage server running.")
lc = self.storage.lease_checker lc = self.storage.lease_checker
p = lc.get_progress() p = lc.get_progress()
if not p["cycle-in-progress"]: if not p["cycle-in-progress"]:
@ -302,8 +286,6 @@ class StorageStatusElement(Element):
@renderer @renderer
def lease_last_cycle_results(self, req, tag): def lease_last_cycle_results(self, req, tag):
if not self.storage:
return tag("No storage server running.")
lc = self.storage.lease_checker lc = self.storage.lease_checker
h = lc.get_state()["history"] h = lc.get_state()["history"]
if not h: if not h: