Skip to content

Commit 38252ad

Browse files
committed
server: fix opts.reset handling in grep_log
Before this commit `opt.reset` wasn't working, because it was rewritten with true.
1 parent b1e3631 commit 38252ad

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
- Fixed a bug when `Server:grep_log()` didn't consider the `reset` option.
6+
37
## 1.2.0
48

59
- Fixed a bug when `server:grep_log()` failed to find a string logged in

luatest/server.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,10 @@ end
878878
-- @return string|nil
879879
function Server:grep_log(pattern, bytes_num, opts)
880880
local options = opts or {}
881-
local reset = options.reset or true
881+
local reset = options.reset
882+
if reset == nil then
883+
reset = true
884+
end
882885
local filename = options.filename or self.log_file
883886
local file = fio.open(filename, {'O_RDONLY', 'O_NONBLOCK'})
884887

test/server_test.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,9 @@ g.test_grep_log = function()
564564
server:connect_net_box()
565565
t.assert_not(server:grep_log('test grep_log'))
566566

567+
-- Test that opts.reset = false works.
568+
t.assert(server:grep_log('test grep_log', nil, {reset = false}))
569+
567570
server.net_box:close()
568571
server.net_box = nil
569572
end

0 commit comments

Comments
 (0)