diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
| commit | 1193a4bdb914eba2a902ae5275bd56438bd49b55 (patch) | |
| tree | 85a3c7b4d4efadd9c68b69eac3178dca98372e19 /util | |
| parent | 0a88a8699681f8ebf26b2f86531328c583c97f7b (diff) | |
| parent | 6a65e76fc615bd10c21776bd4c4455ab522d2f29 (diff) | |
| download | prosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.tar.gz prosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/sql.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua index dcf665fb..f64e8e10 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -102,11 +102,12 @@ function engine:connect() local params = self.params; assert(params.driver, "no driver") log("debug", "Connecting to [%s] %s...", params.driver, params.database); - local dbh, err = DBI.Connect( + local ok, dbh, err = pcall(DBI.Connect, params.driver, params.database, params.username, params.password, params.host, params.port ); + if not ok then return ok, dbh; end if not dbh then return nil, err; end dbh:autocommit(false); -- don't commit automatically self.conn = dbh; |