Software / code / prosody
Changeset
580:9ff2c3c87065
Some code cleaning for the main script
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 06 Dec 2008 23:11:21 +0000 |
| parents | 579:81e68e5afce2 |
| children | 581:23b9cd1206ba |
| files | prosody |
| diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Sat Dec 06 20:25:51 2008 +0000 +++ b/prosody Sat Dec 06 23:11:21 2008 +0000 @@ -112,7 +112,6 @@ local _mkdir = {} function mkdir(path) path = path:gsub("/", path_separator); - --print("mkdir",path); local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a"); end function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end @@ -138,11 +137,7 @@ -- setup error handling -setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][]; - -local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; -local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; - +setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }); local global_ssl_ctx = config.get("*", "core", "ssl"); if global_ssl_ctx then
