aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-06-20 16:16:33 +0200
committerKim Alvefur <zash@zash.se>2014-06-20 16:16:33 +0200
commit578ceff99eb7d50617f715f7e53f8e59387d758b (patch)
tree3ca70e132d2aa69e7d5bc8c2cb77e3ecafe5046d
parent15b3071bebceb195dbf057093dcddf1109b7d4eb (diff)
downloadprosody-578ceff99eb7d50617f715f7e53f8e59387d758b.tar.gz
prosody-578ceff99eb7d50617f715f7e53f8e59387d758b.zip
mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnimator)
-rw-r--r--plugins/mod_storage_sql2.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 249c72a7..0531c905 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -198,7 +198,9 @@ local keyval_store = {};
keyval_store.__index = keyval_store;
function keyval_store:get(username)
user,store = username,self.store;
- return select(2, engine:transaction(keyval_store_get));
+ local ok, result = engine:transaction(keyval_store_get);
+ if not ok then return ok, result; end
+ return result;
end
function keyval_store:set(username, data)
user,store = username,self.store;