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

Fix duplicate content_db connecting

Browse source
This commit is contained in:
shortcutme 2019-11-19 02:12:24 +01:00
parent 57f2a43864
commit cdd9dd4f6f
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Content/ContentDb.py
View file

@ -1,4 +1,3 @@
import time
import os
from Db.Db import Db, DbTableError
@ -12,6 +11,8 @@ class ContentDb(Db):
def __init__(self, path):
Db.__init__(self, {"db_name": "ContentDb", "tables": {}}, path)
self.foreign_keys = True
def init(self):
try:
self.schema = self.getSchema()
try:
@ -25,8 +26,8 @@ class ContentDb(Db):
except Exception as err:
self.log.error("Error loading content.db: %s, rebuilding..." % Debug.formatException(err))
self.close()
os.unlink(path) # Remove and try again
Db.__init__(self, {"db_name": "ContentDb", "tables": {}}, path)
os.unlink(self.db_path) # Remove and try again
Db.__init__(self, {"db_name": "ContentDb", "tables": {}}, self.db_path)
self.foreign_keys = True
self.schema = self.getSchema()
try:
@ -155,6 +156,7 @@ def getContentDb(path=None):
path = "%s/content.db" % config.data_dir
if path not in content_dbs:
content_dbs[path] = ContentDb(path)
content_dbs[path].init()
return content_dbs[path]
getContentDb() # Pre-connect to default one