summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2015-12-24 18:24:31 +0000
committerTed Trask <ttrask01@yahoo.com>2015-12-24 18:24:31 +0000
commit1bb9e4416a705db1093ee1d43c83ce49005a17a2 (patch)
treee05852927830918f57d6cae14a03d030b391f385
parentb933a8ec22730a1a4453dce7bf1a22601b521f9f (diff)
downloadacf-provisioning-1bb9e4416a705db1093ee1d43c83ce49005a17a2.tar.bz2
acf-provisioning-1bb9e4416a705db1093ee1d43c83ce49005a17a2.tar.xz
Fix database exception handling if occurs during connection attempt
-rw-r--r--provisioning-model.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua
index 0ad268e..8388210 100644
--- a/provisioning-model.lua
+++ b/provisioning-model.lua
@@ -154,8 +154,11 @@ local handlesqlexception = function(connected)
mymodule.logevent(sql)
pcall(function() con:execute(sql) end)
provdb.databasedisconnect()
- else
+ elseif provdb.isconnected() then
+ -- database connection ocurred in calling function, propagate the error
error(err)
+ else
+ -- failure during connection, no cleanup needed
end
end