diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-01-21 14:02:56 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-01-21 14:02:56 +0000 |
| commit | 3dda2fcfac6774f42c10338bfc2362ad666b9c5b (patch) | |
| tree | 23a32d78c0d79b7870e1a87f0e6350716c7ba6e0 | |
| parent | c6d7c5abfd104bdccf535c312ba7c4eb12679de4 (diff) | |
| parent | 75862530f265ec9fdc58f7937d90367d252ce74a (diff) | |
| download | prosody-3dda2fcfac6774f42c10338bfc2362ad666b9c5b.tar.gz prosody-3dda2fcfac6774f42c10338bfc2362ad666b9c5b.zip | |
Merge 0.8->trunk
| -rw-r--r-- | core/loggingmanager.lua | 6 | ||||
| -rw-r--r-- | net/dns.lua | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 0e0ae862..b637058c 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -27,8 +27,6 @@ local config = require "core.configmanager"; local logger = require "util.logger"; local prosody = prosody; -local debug_mode = config.get("*", "core", "debug"); - _G.log = logger.init("general"); module "loggingmanager" @@ -166,6 +164,8 @@ function reload_logging() logger.reset(); + local debug_mode = config.get("*", "core", "debug"); + default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } @@ -195,7 +195,7 @@ end -- Column width for "source" (used by stdout and console) local sourcewidth = 20; -function log_sink_types.stdout() +function log_sink_types.stdout(config) local timestamps = config.timestamps; if timestamps == true then diff --git a/net/dns.lua b/net/dns.lua index 61fb62e8..c905f56c 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -158,8 +158,6 @@ resolver.__index = resolver; resolver.timeout = default_timeout; -local SRV_tostring; - local function default_rr_tostring(rr) local rr_val = rr.type and rr[rr.type:lower()]; if type(rr_val) ~= "string" then @@ -170,8 +168,13 @@ end local special_tostrings = { LOC = resolver.LOC_tostring; - MX = function (rr) return string.format('%2i %s', rr.pref, rr.mx); end; - SRV = SRV_tostring; + MX = function (rr) + return string.format('%2i %s', rr.pref, rr.mx); + end; + SRV = function (rr) + local s = rr.srv; + return string.format('%5d %5d %5d %s', s.priority, s.weight, s.port, s.target); + end; }; local rr_metatable = {}; -- - - - - - - - - - - - - - - - - - - rr_metatable @@ -475,12 +478,6 @@ function resolver:PTR(rr) rr.ptr = self:name(); end -function SRV_tostring(rr) -- - - - - - - - - - - - - - - - - - SRV_tostring - local s = rr.srv; - return string.format( '%5d %5d %5d %s', s.priority, s.weight, s.port, s.target ); -end - - function resolver:TXT(rr) -- - - - - - - - - - - - - - - - - - - - - - TXT rr.txt = self:sub (rr.rdlength); end |