aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-08-31 11:45:06 +0100
committerMatthew Wild <mwild1@gmail.com>2016-08-31 11:45:06 +0100
commite73a68034cbc4bd3425d6003c084ca6d4dd3a8c5 (patch)
tree32e1e48a3d938ef04983b994c5a5e615e176c09a /core
parent9ab72215213a390238641ecb949b0b34d3533e77 (diff)
downloadprosody-e73a68034cbc4bd3425d6003c084ca6d4dd3a8c5.tar.gz
prosody-e73a68034cbc4bd3425d6003c084ca6d4dd3a8c5.zip
storagemanager: Simplify function flow
Diffstat (limited to 'core')
-rw-r--r--core/storagemanager.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 8d83f677..64ae13e3 100644
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -153,12 +153,12 @@ function open(host, store, typ)
if err == "unsupported-store" then
if typ == "map" then -- Use shim on top of keyval store
log("debug", "map storage driver unavailable, using shim on top of keyval store.");
- return create_map_shim(host, store);
+ ret, err = create_map_shim(host, store);
+ else
+ log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
+ driver_name, store, typ or "<nil>");
+ ret, err = null_storage_driver, nil;
end
- log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
- driver_name, store, typ or "<nil>");
- ret = null_storage_driver;
- err = nil;
end
end
return ret, err;