techwire/copyparty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lower timeout on db reads

Browse Source
This commit is contained in:
ed 2021-06-20 21:03:35 +02:00
parent 36dc1107fb
commit 357347ce3a
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
copyparty/httpcli.py
View File

@ -1770,11 +1770,16 @@ class HttpCli(object):
_, rd = vn.get_dbv(rd) _, rd = vn.get_dbv(rd)
q = "select w from up where rd = ? and fn = ?" q = "select w from up where rd = ? and fn = ?"
r = None
try: try:
r = icur.execute(q, (rd, fn)).fetchone() r = icur.execute(q, (rd, fn)).fetchone()
except: except Exception as ex:
if "database is locked" not in str(ex):
try:
args = s3enc(idx.mem_cur, rd, fn) args = s3enc(idx.mem_cur, rd, fn)
r = icur.execute(q, args).fetchone() r = icur.execute(q, args).fetchone()
except:
self.log("tag list error:\n" + min_ex())
tags = {} tags = {}
f["tags"] = tags f["tags"] = tags
@ -1784,9 +1789,12 @@ class HttpCli(object):
w = r[0][:16] w = r[0][:16]
q = "select k, v from mt where w = ? and k != 'x'" q = "select k, v from mt where w = ? and k != 'x'"
try:
for k, v in icur.execute(q, (w,)): for k, v in icur.execute(q, (w,)):
taglist[k] = True taglist[k] = True
tags[k] = v tags[k] = v
except:
self.log("tag read error:\n" + min_ex())
if icur: if icur:
taglist = [k for k in vn.flags.get("mte", "").split(",") if k in taglist] taglist = [k for k in vn.flags.get("mte", "").split(",") if k in taglist]

2
copyparty/u2idx.py
View File

@ -66,7 +66,7 @@ class U2idx(object):
if not os.path.exists(db_path): if not os.path.exists(db_path):
return None return None
cur = sqlite3.connect(db_path).cursor() cur = sqlite3.connect(db_path, 2).cursor()
self.cur[ptop] = cur self.cur[ptop] = cur
return cur return cur