aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-07 17:43:14 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-07 17:43:14 +0100
commit137f76396600f44532054db2829d1e7ae2fa2cb6 (patch)
tree8e3a90605b91996ab7c0d192ef682c204037b041 /util
parent7573762c919f99025acd0e1cac7ec9d3df82b852 (diff)
downloadprosody-137f76396600f44532054db2829d1e7ae2fa2cb6.tar.gz
prosody-137f76396600f44532054db2829d1e7ae2fa2cb6.zip
util.sql: Allow onconnect callback to fail connection to the DB by returning false, err
Diffstat (limited to 'util')
-rw-r--r--util/sql.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index 92032f43..dedef435 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -111,7 +111,10 @@ function engine:connect()
self.conn = dbh;
self.prepared = {};
self:set_encoding();
- self:onconnect();
+ local ok, err = self:onconnect();
+ if ok == false then
+ return ok, err;
+ end
return true;
end
function engine:onconnect()