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

Revert "[modules/getcrypto] Deal with kraken service downtime"

Browse source 
This reverts commit 3615e60e5b.

Time to go to sleep, so many mistakes...
This commit is contained in:
Tobias Witek 2018-01-11 20:31:48 +01:00
parent 3615e60e5b
commit 650e0b933e
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bumblebee/engine.py
View file

@ -40,7 +40,6 @@ class Module(object):
self.id = self.name self.id = self.name
self._next = int(time.time()) self._next = int(time.time())
self._default_interval = 0 self._default_interval = 0
self.success = True
self._configFile = None self._configFile = None
for cfg in [os.path.expanduser("~/.bumblebee-status.conf"), os.path.expanduser("~/.config/bumblebee-status.conf")]: for cfg in [os.path.expanduser("~/.bumblebee-status.conf"), os.path.expanduser("~/.config/bumblebee-status.conf")]:
@ -81,12 +80,7 @@ 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
try:
self.update(self._widgets) self.update(self._widgets)
self.success = True
except Exception as e:
log.error("failed to update module {}: {}".format(self.name, str(e)))
self.success = False
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):

2
bumblebee/modules/getcrypto.py
View file

@ -34,8 +34,6 @@ def getfromkrak(coin, currency):
krakenget = requests.get('https://api.kraken.com/0/public/Ticker?pair='+epair).json() krakenget = requests.get('https://api.kraken.com/0/public/Ticker?pair='+epair).json()
except (RequestException, Exception): except (RequestException, Exception):
return "No connection" return "No connection"
if not 'result' in krakenget:
return "No data"
kethusdask = float(krakenget['result'][tickname]['a'][0]) kethusdask = float(krakenget['result'][tickname]['a'][0])
kethusdbid = float(krakenget['result'][tickname]['b'][0]) kethusdbid = float(krakenget['result'][tickname]['b'][0])
return coin+": "+str((kethusdask+kethusdbid)/2)[0:6] return coin+": "+str((kethusdask+kethusdbid)/2)[0:6]

2
bumblebee/output.py
View file

@ -117,7 +117,7 @@ class I3BarOutput(object):
}) })
width = self._theme.minwidth(widget) width = self._theme.minwidth(widget)
self._widgets.append({ self._widgets.append({
u"full_text": full_text u"full_text": full_text,
"color": self._theme.fg(widget), "color": self._theme.fg(widget),
"background": self._theme.bg(widget), "background": self._theme.bg(widget),
"separator_block_width": self._theme.separator_block_width(widget), "separator_block_width": self._theme.separator_block_width(widget),