prosody
e9d7a409e236
core/storagemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/storagemanager.lua @ 7647:e9d7a409e236

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 31 Aug 2016 16:25:21 +0100
parent 7327:d62f0471470f
parent 7645:d7b1bc069c12
child 7950:f91e7ec9654e
comparison
equal deleted inserted replaced
7641:5eef792bb2e1 7647:e9d7a409e236
151 local ret, err = driver:open(store, typ); 151 local ret, err = driver:open(store, typ);
152 if not ret then 152 if not ret then
153 if err == "unsupported-store" then 153 if err == "unsupported-store" then
154 if typ == "map" then -- Use shim on top of keyval store 154 if typ == "map" then -- Use shim on top of keyval store
155 log("debug", "map storage driver unavailable, using shim on top of keyval store."); 155 log("debug", "map storage driver unavailable, using shim on top of keyval store.");
156 return create_map_shim(host, store); 156 ret, err = create_map_shim(host, store);
157 end 157 else
158 log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver", 158 log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
159 driver_name, store, typ or "<nil>"); 159 driver_name, store, typ or "<nil>");
160 ret = null_storage_driver; 160 ret, err = null_storage_driver, nil;
161 err = nil; 161 end
162 end 162 end
163 end
164 if ret then
165 local event_data = { host = host, store_name = store, store_type = typ, store = ret };
166 prosody.hosts[host].events.fire_event("store-opened", event_data);
167 ret, err = event_data.store, event_data.store_err;
163 end 168 end
164 return ret, err; 169 return ret, err;
165 end 170 end
166 171
167 local function purge(user, host) 172 local function purge(user, host)