mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 2039: 6304-fix-ring-buffer 

Updates #6304.

Squashed commit of the following:

commit 7382630404cf18ff45e54234134c192161f5d94a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 12 19:37:01 2023 +0300

    all: upd chlog

commit ff9a82a6872f3bd93fe89956c5441429c189bce7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 12 19:27:35 2023 +0300

    querylog: fix ring buffer
This commit is contained in:
Stanislav Chzhen 2023-10-12 19:48:12 +03:00
parent d3fabdda40
commit bb652cd9a1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -23,6 +23,12 @@ See also the [v0.107.40 GitHub milestone][ms-v0.107.40].
NOTE: Add new changes BELOW THIS COMMENT. NOTE: Add new changes BELOW THIS COMMENT.
--> -->
### Fixed
- Panic on clearing query log ([#6304]).
[#6304]: https://github.com/AdguardTeam/AdGuardHome/issues/6304
<!-- <!--
NOTE: Add new changes ABOVE THIS COMMENT. NOTE: Add new changes ABOVE THIS COMMENT.
--> -->

2
internal/querylog/qlog.go
View File

@ -139,7 +139,7 @@ func (l *queryLog) clear() {
l.bufferLock.Lock() l.bufferLock.Lock()
defer l.bufferLock.Unlock() defer l.bufferLock.Unlock()
l.buffer = nil l.buffer.Clear()
l.flushPending = false l.flushPending = false
}() }()