aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2019-02-22 11:07:03 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2019-02-22 11:59:37 +0200
commit41e9f4e1394022f7945154eeea5465d43e8fe060 (patch)
tree5f69e603567262b98660a106022a607aa2f14c0a
parenta6e1b5526a0cf52e8aabdf043f6447e6e3293856 (diff)
downloaddmvpn-tools-41e9f4e1394022f7945154eeea5465d43e8fe060.tar.bz2
dmvpn-tools-41e9f4e1394022f7945154eeea5465d43e8fe060.tar.xz
dmvpn-ca: handle inaccessible database
-rwxr-xr-xdmvpn-ca7
1 files changed, 5 insertions, 2 deletions
diff --git a/dmvpn-ca b/dmvpn-ca
index 3b4b405..f8e6a1b 100755
--- a/dmvpn-ca
+++ b/dmvpn-ca
@@ -96,6 +96,9 @@ function connection()
if not sql then
sql = require('luasql.sqlite3').sqlite3()
conn = sql:connect(config.db.file)
+ if not conn then
+ error('Cannot open database file: '..config.db.file)
+ end
conn:setautocommit(false)
end
return conn
@@ -1510,12 +1513,12 @@ if syntax then
)
if status then
if output then print_table(output) end
- if sql then conn:commit() end
+ if conn then conn:commit() end
else print(output) end
end
if sql then
- conn:close()
+ if conn then conn:close() end
sql:close()
end