Skip to content

Commit 1cb3b56

Browse files
committed
Add helper method outputForLevel to make it easier to read.
1 parent 94c01fe commit 1cb3b56

2 files changed

Lines changed: 31 additions & 9 deletions

File tree

log/loglevel.lua

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,21 @@ setmetatable(loglevel, {
1010
__index = log
1111
})
1212

13-
-- Attach the logs to the loglevel object and set default to INFO
14-
for level, level_value in pairs(loglevel.levels) do
13+
-- Gets the output for the given level as compared to the loglevel.level
14+
local function outputForLevel(level)
15+
level = string.upper(level)
16+
local level_value = loglevel.levels[level]
17+
if not level_value then
18+
error('Illegal level ' + level)
19+
end
1520
local current_level_value = loglevel.levels[loglevel.level]
1621
local output = (current_level_value <= level_value) and loglevel.defaultOutput or '/dev/null'
22+
return output
23+
end
24+
25+
-- Attach the logs to the loglevel object and set default to INFO
26+
for level in pairs(loglevel.levels) do
27+
local output = outputForLevel(level)
1728
loglevel[level] = log.new(output)
1829
loglevel[level]:set_prefix(string.format('[%s] ', level))
1930
loglevel[level]:set_flags { date = true }
@@ -32,8 +43,8 @@ function loglevel.SetLevel(new_level)
3243
error('Illegal level ' + new_level)
3344
end
3445
loglevel.level = new_level
35-
for level, level_value in pairs(loglevel.levels) do
36-
local output = (new_level_value <= level_value) and loglevel.defaultOutput or '/dev/null'
46+
for level in pairs(loglevel.levels) do
47+
local output = outputForLevel(level)
3748
loglevel[level]:set_output(output)
3849
end
3950
end

log/lua_const.go

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// GENERATED BY textFileToGoConst
22
// GitHub: github.com/logrusorgru/textFileToGoConst
33
// input file: loglevel.lua
4-
// generated: Thu Nov 17 09:38:51 PST 2022
4+
// generated: Thu Nov 17 09:45:15 PST 2022
55

66
package log
77

@@ -17,10 +17,21 @@ setmetatable(loglevel, {
1717
__index = log
1818
})
1919
20-
-- Attach the logs to the loglevel object and set default to INFO
21-
for level, level_value in pairs(loglevel.levels) do
20+
-- Gets the output for the given level as compared to the loglevel.level
21+
local function outputForLevel(level)
22+
level = string.upper(level)
23+
local level_value = loglevel.levels[level]
24+
if not level_value then
25+
error('Illegal level ' + level)
26+
end
2227
local current_level_value = loglevel.levels[loglevel.level]
2328
local output = (current_level_value <= level_value) and loglevel.defaultOutput or '/dev/null'
29+
return output
30+
end
31+
32+
-- Attach the logs to the loglevel object and set default to INFO
33+
for level in pairs(loglevel.levels) do
34+
local output = outputForLevel(level)
2435
loglevel[level] = log.new(output)
2536
loglevel[level]:set_prefix(string.format('[%s] ', level))
2637
loglevel[level]:set_flags { date = true }
@@ -39,8 +50,8 @@ function loglevel.SetLevel(new_level)
3950
error('Illegal level ' + new_level)
4051
end
4152
loglevel.level = new_level
42-
for level, level_value in pairs(loglevel.levels) do
43-
local output = (new_level_value <= level_value) and loglevel.defaultOutput or '/dev/null'
53+
for level in pairs(loglevel.levels) do
54+
local output = outputForLevel(level)
4455
loglevel[level]:set_output(output)
4556
end
4657
end

0 commit comments

Comments
 (0)