diff options
author | Kim Alvefur <zash@zash.se> | 2019-03-02 22:26:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-03-02 22:26:30 +0100 |
commit | 0f12a9df664dc270027fae3a2a73793d0bd9d58e (patch) | |
tree | 9c07d3532265be3ddc92f57b06ce6afb2df29a50 | |
parent | 59f517457b5542d8533d43734f99036451d16d8b (diff) | |
parent | 7241f866687168f1e3f9238ea240af0f4b319ccb (diff) | |
download | prosody-0f12a9df664dc270027fae3a2a73793d0bd9d58e.tar.gz prosody-0f12a9df664dc270027fae3a2a73793d0bd9d58e.zip |
Merge 0.11->trunk
-rw-r--r-- | plugins/mod_storage_memory.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_storage_memory.lua b/plugins/mod_storage_memory.lua index 5a6ce6bf..745e394b 100644 --- a/plugins/mod_storage_memory.lua +++ b/plugins/mod_storage_memory.lua @@ -3,6 +3,7 @@ local array = require "util.array"; local envload = require "util.envload".envload; local st = require "util.stanza"; local is_stanza = st.is_stanza or function (s) return getmetatable(s) == st.stanza_mt end +local new_id = require "util.id".medium; local auto_purge_enabled = module:get_option_boolean("storage_memory_temporary", false); local auto_purge_stores = module:get_option_set("storage_memory_temporary_stores", {}); @@ -64,7 +65,7 @@ function archive_store:append(username, key, value, when, with) end local v = { key = key, when = when, with = with, value = value }; if not key then - key = tostring(a):match"%x+$"..tostring(v):match"%x+$"; + key = new_id(); v.key = key; end if a[key] then |