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

Make Chart plugin compatible with db changes

Browse source
This commit is contained in:
shortcutme 2019-11-27 03:07:44 +01:00
parent fca9db7972
commit f7c767c1c8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/Chart/ChartCollector.py
View file

@ -146,8 +146,7 @@ class ChartCollector(object):
s = time.time() s = time.time()
cur = self.db.getCursor() cur = self.db.getCursor()
cur.cursor.executemany("INSERT INTO data (type_id, value, date_added) VALUES (?, ?, ?)", values) cur.executemany("INSERT INTO data (type_id, value, date_added) VALUES (?, ?, ?)", values)
cur.close()
self.log.debug("Global collectors inserted in %.3fs" % (time.time() - s)) self.log.debug("Global collectors inserted in %.3fs" % (time.time() - s))
def collectSites(self, sites, collectors, last_values): def collectSites(self, sites, collectors, last_values):
@ -163,8 +162,7 @@ class ChartCollector(object):
s = time.time() s = time.time()
cur = self.db.getCursor() cur = self.db.getCursor()
cur.cursor.executemany("INSERT INTO data (type_id, site_id, value, date_added) VALUES (?, ?, ?, ?)", values) cur.executemany("INSERT INTO data (type_id, site_id, value, date_added) VALUES (?, ?, ?, ?)", values)
cur.close()
self.log.debug("Site collectors inserted in %.3fs" % (time.time() - s)) self.log.debug("Site collectors inserted in %.3fs" % (time.time() - s))
def collector(self): def collector(self):

8
plugins/Chart/ChartDb.py
View file

@ -48,15 +48,15 @@ class ChartDb(Db):
def getTypeId(self, name): def getTypeId(self, name):
if name not in self.types: if name not in self.types:
self.execute("INSERT INTO type ?", {"name": name}) res = self.execute("INSERT INTO type ?", {"name": name})
self.types[name] = self.cur.cursor.lastrowid self.types[name] = res.lastrowid
return self.types[name] return self.types[name]
def getSiteId(self, address): def getSiteId(self, address):
if address not in self.sites: if address not in self.sites:
self.execute("INSERT INTO site ?", {"address": address}) res = self.execute("INSERT INTO site ?", {"address": address})
self.sites[address] = self.cur.cursor.lastrowid self.sites[address] = res.lastrowid
return self.sites[address] return self.sites[address]