Skip to content

Commit 7289269

Browse files
authored
#19: Fix filtering of trace messages (#20)
* #19: Fix filtering of trace messages
1 parent 393583c commit 7289269

File tree

7 files changed

+92
-8
lines changed

7 files changed

+92
-8
lines changed

.github/workflows/broken_links_checker.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2
13+
- name: Configure broken links checker
14+
run: |
15+
mkdir -p ./target
16+
echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json
1317
- uses: gaurav-nelson/github-action-markdown-link-check@v1
1418
with:
1519
use-quiet-mode: 'yes'
16-
use-verbose-mode: 'yes'
20+
use-verbose-mode: 'yes'
21+
config-file: ./target/broken_links_checker.json

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changes
22

3+
* [1.1.1](changes_1.1.1.md)
34
* [1.1.0](changes_1.1.0.md)
45
* [1.0.1](changes_1.0.1.md)
56
* [1.0.0](changes_1.0.0.md)

doc/changes/changes_1.1.1.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# remotelog-lua 1.1.1, released 2022-03-??
2+
3+
Code name: Fix filtering of `trace` messages
4+
5+
## Summary
6+
7+
Version 1.1.1 of `remotelog-lua` fixes a bug that caused `trace` messages always being logged, independent of the log level.
8+
9+
### Bugfixes
10+
11+
* #19: Fixed filtering of `trace` messages

remotelog-1.1.0-1.rockspec renamed to remotelog-1.1.1-1.rockspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
rockspec_format = "3.0"
22

33
package = "remotelog"
4-
version = "1.1.0-1"
4+
version = "1.1.1-1"
55

66
source = {
77
url = 'git://github.com/exasol/remotelog-lua',
8-
tag = "1.1.0"
8+
tag = "1.1.1"
99
}
1010

1111
description = {

src/remotelog.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ local fallback_strategies = {CONSOLE = 1, DISCARD = 2, ERROR = 3}
1414
-- </p>
1515
--
1616
local M = {
17-
VERSION = "1.1.0",
17+
VERSION = "1.1.1",
1818
level = levels.INFO,
1919
socket_client = nil,
2020
connection_timeout = 0.1, -- seconds
@@ -306,7 +306,7 @@ end
306306
-- @param ... log message or message pattern with placeholders and values
307307
--
308308
function M.trace(...)
309-
if M.level >= levels.FATAL then
309+
if M.level >= levels.TRACE then
310310
write("TRACE", ...)
311311
end
312312
end

test/test_remotelog.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,24 @@ function test_log:test_debug()
7474
self:assert_message(self.today .. " [DEBUG] Look what we have here.\n")
7575
end
7676

77+
function test_log:test_debug_not_logged()
78+
self.log.set_level("INFO")
79+
self.log.debug("don't send")
80+
self:assert_no_message(self.today .. " [DEBUG] don't send\n")
81+
end
82+
7783
function test_log:test_trace()
7884
self.log.set_level("TRACE")
7985
self.log.trace("foo(bar)")
8086
self:assert_message(self.today .. " [TRACE] foo(bar)\n")
8187
end
8288

89+
function test_log:test_trace_not_logged()
90+
self.log.set_level("DEBUG")
91+
self.log.trace("don't send")
92+
self:assert_no_message(self.today .. " [TRACE] don't send\n")
93+
end
94+
8395
function test_log:test_set_log_level()
8496
self.log.set_level("WARN")
8597
self.log.info("don't send")

test/test_remotelog_console.lua

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,45 +31,100 @@ local function assert_message(call, original_message, expected_message)
3131
luaunit.assertEquals(actual_message, expected_message)
3232
end
3333

34-
local function assert_no_message(call, original_message)
35-
local actual_message = trace.trace_print(call, original_message)
34+
local function assert_no_message(call)
35+
local actual_message = trace.trace_print(call, "This message is not sent.")
3636
luaunit.assertNil(actual_message)
3737
end
3838

3939
function test_console_log:test_fatal()
4040
assert_message(self.log.fatal, "Good by, cruel world!", self.today .. " [FATAL] Good by, cruel world!")
4141
end
4242

43+
function test_console_log:test_fatal_exact_level()
44+
self.log.set_level("FATAL")
45+
assert_message(self.log.fatal, "Good by, cruel world!", self.today .. " [FATAL] Good by, cruel world!")
46+
end
47+
48+
function test_console_log:test_fatal_not_logged()
49+
self.log.set_level("NONE")
50+
assert_no_message(self.log.fatal)
51+
end
52+
4353
function test_console_log:test_error()
4454
assert_message(self.log.error, "Oops!", self.today .. " [ERROR] Oops!")
4555
end
4656

57+
function test_console_log:test_error_exact_level()
58+
self.log.set_level("ERROR")
59+
assert_message(self.log.error, "Oops!", self.today .. " [ERROR] Oops!")
60+
end
61+
62+
function test_console_log:test_error_not_logged()
63+
self.log.set_level("FATAL")
64+
assert_no_message(self.log.error)
65+
end
66+
4767
function test_console_log:test_warn()
4868
assert_message(self.log.warn, "This looks suspicious...", self.today .. " [WARN] This looks suspicious...")
4969
end
5070

71+
function test_console_log:test_warn_exact_level()
72+
self.log.set_level("WARN")
73+
assert_message(self.log.warn, "This looks suspicious...", self.today .. " [WARN] This looks suspicious...")
74+
end
75+
76+
function test_console_log:test_warn_not_logged()
77+
self.log.set_level("ERROR")
78+
assert_no_message(self.log.warn)
79+
end
80+
5181
function test_console_log:test_info()
5282
assert_message(self.log.info, "Good to know.", self.today .. " [INFO] Good to know.")
5383
end
5484

85+
function test_console_log:test_info_exact_level()
86+
self.log.set_level("INFO")
87+
assert_message(self.log.info, "Good to know.", self.today .. " [INFO] Good to know.")
88+
end
89+
90+
function test_console_log:test_info_not_logged()
91+
self.log.set_level("WARN")
92+
assert_no_message(self.log.info)
93+
end
94+
5595
function test_console_log:test_config()
5696
self.log.set_level("CONFIG")
5797
assert_message(self.log.config, "Life support enabled.", self.today .. " [CONFIG] Life support enabled.")
5898
end
5999

100+
function test_console_log:test_config_not_logged()
101+
self.log.set_level("INFO")
102+
assert_no_message(self.log.config)
103+
end
104+
60105
function test_console_log:test_debug()
61106
self.log.set_level("DEBUG")
62107
assert_message(self.log.debug, "Look what we have here.", self.today .. " [DEBUG] Look what we have here.")
63108
end
64109

110+
function test_console_log:test_debug_not_logged()
111+
self.log.set_level("INFO")
112+
assert_no_message(self.log.debug)
113+
end
114+
65115
function test_console_log:test_trace()
66116
self.log.set_level("TRACE")
67117
assert_message(self.log.trace, "foo(bar)", self.today .. " [TRACE] foo(bar)")
68118
end
69119

120+
function test_console_log:test_trace_not_logged()
121+
self.log.set_level("DEBUG")
122+
assert_no_message(self.log.trace)
123+
end
124+
70125
function test_console_log:test_set_log_level()
71126
self.log.set_level("WARN")
72-
assert_no_message(self.log.info, "don't send")
127+
assert_no_message(self.log.info)
73128
assert_message(self.log.warn, "send", self.today .. " [WARN] send")
74129
end
75130

0 commit comments

Comments
 (0)