Merge: - querylog: querylog_memsize setting was reset to 0
* commit 'bebd43923b71b2ef4bf4e1beb5bb69ff6208d06e': - querylog: querylog_memsize setting was reset to 0
This commit is contained in:
commit
c5a39b942f
@ -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"`
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user