diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
| commit | 669449342ff7f72b94149861c8dbf156d0343e1a (patch) | |
| tree | 4c56350b49c07b9ab63a705fc167339ef54dca96 /core | |
| parent | e6fa5c423772e1c379abaeff6f35ba2e1e5153af (diff) | |
| parent | be752a7c9ef957cc05b83941ff5be1971312b171 (diff) | |
| download | prosody-669449342ff7f72b94149861c8dbf156d0343e1a.tar.gz prosody-669449342ff7f72b94149861c8dbf156d0343e1a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 2 | ||||
| -rw-r--r-- | core/storagemanager.lua | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 9b773f89..d89d46fa 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -431,7 +431,7 @@ function api:measure(name, stat_type) end function api:measure_object_event(events_object, event_name, stat_name) - local m = self:measure(stat_name or event_name, "duration"); + local m = self:measure(stat_name or event_name, "times"); local function handler(handlers, _event_name, _event_data) local finished = m(); local ret = handlers(_event_name, _event_data); diff --git a/core/storagemanager.lua b/core/storagemanager.lua index cadae0ed..f0450dfb 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -153,14 +153,19 @@ 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 + if ret then + local event_data = { host = host, store_name = store, store_type = typ, store = ret }; + prosody.hosts[host].events.fire_event("store-opened", event_data); + ret, err = event_data.store, event_data.store_err; + end return ret, err; end |