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

Log DB close time, formatting

Browse source
This commit is contained in:
HelloZeroNet 2016-05-16 22:28:59 +02:00
parent bba7318a5b
commit 5b35bea489
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Db/Db.py
View file

@ -56,7 +56,7 @@ class Db(object):
self.log.debug("Db file not exist yet: %s" % self.db_path) self.log.debug("Db file not exist yet: %s" % self.db_path)
self.conn = sqlite3.connect(self.db_path) self.conn = sqlite3.connect(self.db_path)
if config.verbose: if config.verbose:
self.log.debug("Connected to Db in %.3fs" % (time.time()-s)) self.log.debug("Connected to Db in %.3fs" % (time.time() - s))
self.conn.row_factory = sqlite3.Row self.conn.row_factory = sqlite3.Row
self.conn.isolation_level = None self.conn.isolation_level = None
self.cur = self.getCursor() self.cur = self.getCursor()
@ -67,8 +67,7 @@ class Db(object):
if self.foreign_keys: if self.foreign_keys:
self.execute("PRAGMA foreign_keys = ON") self.execute("PRAGMA foreign_keys = ON")
if config.verbose: if config.verbose:
self.log.debug("Db is ready to use in %.3fs" % (time.time()-s)) self.log.debug("Db is ready to use in %.3fs" % (time.time() - s))
# Execute query using dbcursor # Execute query using dbcursor
def execute(self, query, params=None): def execute(self, query, params=None):
@ -78,7 +77,7 @@ class Db(object):
return self.cur.execute(query, params) return self.cur.execute(query, params)
def close(self): def close(self):
self.log.debug("Closing, opened: %s" % opened_dbs) s = time.time()
if self in opened_dbs: if self in opened_dbs:
opened_dbs.remove(self) opened_dbs.remove(self)
if self.cur: if self.cur:
@ -87,6 +86,7 @@ class Db(object):
self.conn.close() self.conn.close()
self.conn = None self.conn = None
self.cur = None self.cur = None
self.log.debug("Closed in %.3fs, opened: %s" % (time.time() - s, opened_dbs))
# Gets a cursor object to database # Gets a cursor object to database
# Return: Cursor class # Return: Cursor class
@ -318,4 +318,4 @@ if __name__ == "__main__":
cur.execute("COMMIT") cur.execute("COMMIT")
print "Done in %.3fs" % (time.time() - s) print "Done in %.3fs" % (time.time() - s)
for query, stats in sorted(dbjson.query_stats.items()): for query, stats in sorted(dbjson.query_stats.items()):
print "-", query, stats print "-", query, stats