l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/engine] handle single-module errors

Browse source 
instead of terminating the whole status bar when an error occurs, just
show a (truncated) error for that single widget.

this should also enable auto-recovery if the module returns to a "good"
state, but that hasn't been tested yet.

see #221 and #222
This commit is contained in:
Tobias Witek 2018-01-12 18:39:36 +01:00
parent 04ce2de228
commit bf84498df3
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bumblebee/engine.py
View file

@ -38,6 +38,7 @@ class Module(object):
self.name = config.get("name", self.__module__.split(".")[-1]) self.name = config.get("name", self.__module__.split(".")[-1])
self._config = config self._config = config
self.id = self.name self.id = self.name
self.error = None
self._next = int(time.time()) self._next = int(time.time())
self._default_interval = 0 self._default_interval = 0
@ -67,6 +68,12 @@ class Module(object):
if widget.name == name: if widget.name == name:
return widget return widget
def errorWidget(self):
msg = self.error
if len(msg) > 10:
msg = "{}...".format(msg[0:7])
return bumblebee.output.Widget(full_text="error: {}".format(msg))
def widget_by_id(self, uid): def widget_by_id(self, uid):
for widget in self._widgets: for widget in self._widgets:
if widget.id == uid: if widget.id == uid:
@ -80,7 +87,12 @@ class Module(object):
def update_wrapper(self, widgets): def update_wrapper(self, widgets):
if self._next > int(time.time()): if self._next > int(time.time()):
return return
self.update(self._widgets) try:
self.error = None
self.update(self._widgets)
except Exception as e:
log.error("error updating '{}': {}".format(self.name, str(e)))
self.error = str(e)
self._next += int(self.parameter("interval", self._default_interval))*60 self._next += int(self.parameter("interval", self._default_interval))*60
def interval(self, intvl): def interval(self, intvl):
@ -244,9 +256,12 @@ class Engine(object):
for module in self._modules: for module in self._modules:
self._current_module = module self._current_module = module
module.update_wrapper(module.widgets()) module.update_wrapper(module.widgets())
for widget in module.widgets(): if module.error == None:
widget.link_module(module) for widget in module.widgets():
self._output.draw(widget=widget, module=module, engine=self) widget.link_module(module)
self._output.draw(widget=widget, module=module, engine=self)
else:
self._output.draw(widget=module.errorWidget(), module=module, engine=self)
self._output.flush() self._output.flush()
self._output.end() self._output.end()
if self.running(): if self.running():