mod_c2s, mod_s2s: Bootstrap connection count statistic on module load

[prosody.git] / util / serialization.lua

diff --git a/util/serialization.lua b/util/serialization.lua
index e193b64f7ff70e8683ef06cfafa365cefbcd65f3..206f5fbbf59bda7766172dfb8cc6e3dceaf5c0a3 100644 (file)
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -11,17 +11,16 @@ local type = type;
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
-local error = error;
 local pairs = pairs;
 local next = next;
 
-local loadstring = loadstring;
-local setfenv = setfenv;
 local pcall = pcall;
 
 local debug_traceback = debug.traceback;
 local log = require "util.logger".init("serialization");
-module "serialization"
+local envload = require"util.envload".envload;
+
+local _ENV = nil;
 
 local indent = function(i)
        return string_rep("\t", i);
@@ -72,24 +71,27 @@ local function _simplesave(o, ind, t, func)
        end
 end
 
-function append(t, o)
+local function append(t, o)
        _simplesave(o, 1, t, t.write or t_insert);
        return t;
 end
 
-function serialize(o)
+local function serialize(o)
        return t_concat(append({}, o));
 end
 
-function deserialize(str)
+local function deserialize(str)
        if type(str) ~= "string" then return nil; end
        str = "return "..str;
-       local f, err = loadstring(str, "@data");
+       local f, err = envload(str, "@data", {});
        if not f then return nil, err; end
-       setfenv(f, {});
        local success, ret = pcall(f);
        if not success then return nil, ret; end
        return ret;
 end
 
-return _M;
+return {
+       append = append;
+       serialize = serialize;
+       deserialize = deserialize;
+};