oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix site number changes when data collected for stats

Browse source
This commit is contained in:
shortcutme 2019-12-04 17:14:04 +01:00
parent 31f505b309
commit daee14533c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/Chart/ChartCollector.py
View file

@ -119,6 +119,8 @@ class ChartCollector(object):
value = collector(peers) value = collector(peers)
else: else:
value = collector() value = collector()
except ValueError:
value = None
except Exception as err: except Exception as err:
self.log.info("Collector %s error: %s" % (key, err)) self.log.info("Collector %s error: %s" % (key, err))
value = None value = None
@ -153,7 +155,7 @@ class ChartCollector(object):
now = int(time.time()) now = int(time.time())
s = time.time() s = time.time()
values = [] values = []
for address, site in sites.items(): for address, site in list(sites.items()):
site_datas = self.collectDatas(collectors, last_values["site:%s" % address], site) site_datas = self.collectDatas(collectors, last_values["site:%s" % address], site)
for key, value in site_datas.items(): for key, value in site_datas.items():
values.append((self.db.getTypeId(key), self.db.getSiteId(address), value, now)) values.append((self.db.getTypeId(key), self.db.getSiteId(address), value, now))