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

Merge: - querylog: querylog_memsize setting was reset to 0 

* commit 'bebd43923b71b2ef4bf4e1beb5bb69ff6208d06e':
  - querylog: querylog_memsize setting was reset to 0
This commit is contained in:
Simon Zolin 2020-03-19 18:58:34 +03:00
parent 6eadca25d1 bebd43923b
commit c5a39b942f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home/config.go
View File

@ -77,9 +77,9 @@ type dnsConfig struct {
// time interval for statistics (in days) // time interval for statistics (in days)
StatsInterval uint32 `yaml:"statistics_interval"` StatsInterval uint32 `yaml:"statistics_interval"`
QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days) QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_memsize"` // number of entries kept in memory before they are flushed to disk QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk
dnsforward.FilteringConfig `yaml:",inline"` dnsforward.FilteringConfig `yaml:",inline"`

2
home/home_test.go
View File

@ -28,7 +28,7 @@ dns:
statistics_interval: 90 statistics_interval: 90
querylog_enabled: true querylog_enabled: true
querylog_interval: 90 querylog_interval: 90
querylog_memsize: 0 querylog_size_memory: 0
protection_enabled: true protection_enabled: true
blocking_mode: null_ip blocking_mode: null_ip
blocked_response_ttl: 0 blocked_response_ttl: 0

1
querylog/qlog.go
View File

@ -65,6 +65,7 @@ func checkInterval(days uint32) bool {
func (l *queryLog) WriteDiskConfig(dc *DiskConfig) { func (l *queryLog) WriteDiskConfig(dc *DiskConfig) {
dc.Enabled = l.conf.Enabled dc.Enabled = l.conf.Enabled
dc.Interval = l.conf.Interval dc.Interval = l.conf.Interval
dc.MemSize = l.conf.MemSize
} }
// Clear memory buffer and remove log files // Clear memory buffer and remove log files