Mercurial > prosody-hg
comparison core/loggingmanager.lua @ 5273:746f07d280e2
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 28 Dec 2012 03:03:56 +0100 |
| parents | 1e555909f23d |
| children | 898454038524 |
comparison
equal
deleted
inserted
replaced
| 5271:f716a3c58b4b | 5273:746f07d280e2 |
|---|---|
| 65 if type(logging_config) == "table" then | 65 if type(logging_config) == "table" then |
| 66 | 66 |
| 67 for _, level in ipairs(logging_levels) do | 67 for _, level in ipairs(logging_levels) do |
| 68 if type(logging_config[level]) == "string" then | 68 if type(logging_config[level]) == "string" then |
| 69 local value = logging_config[level]; | 69 local value = logging_config[level]; |
| 70 if sink_type == "file" then | 70 if sink_type == "file" and not value:match("^%*") then |
| 71 add_rule({ | 71 add_rule({ |
| 72 to = sink_type; | 72 to = sink_type; |
| 73 filename = value; | 73 filename = value; |
| 74 timestamps = true; | 74 timestamps = true; |
| 75 levels = { min = level }; | 75 levels = { min = level }; |
