hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

Raise the "database locked" error from caller context

Browse Source
This commit is contained in:
df 2020-10-18 19:19:26 +00:00
parent 3981bbd37e
commit 13f3b1ccce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webif/lib/settings.class
View File

@ -62,8 +62,14 @@ proc {settings _safer_query} { queryText args } {
try { try {
return [$settingsdb query $queryText {*}$arg] return [$settingsdb query $queryText {*}$arg]
} on error {msg opts} { } on error {msg opts} {
if {[string first "database is locked" $msg] >= 0 && [incr lockCnt -1] > 0} { if {[string first "database is locked" $msg] >= 0} {
if {[incr lockCnt -1] > 0} {
continue continue
} else {
# raise error from caller
set msg "Persistently unable to access Settings: database locked"
incr opts(-level)
}
} }
return {*}$opts $msg return {*}$opts $msg
} }