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

home: http client dns cache

This commit is contained in:
Dimitry Kolyshev 2023-11-20 13:51:00 +02:00
parent c8f1112d4e
commit 944e0d7a4b
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/home/clientshttp.go
View File

@ -56,13 +56,21 @@ type clientJSON struct {
IgnoreQueryLog aghalg.NullBool `json:"ignore_querylog"` IgnoreQueryLog aghalg.NullBool `json:"ignore_querylog"`
IgnoreStatistics aghalg.NullBool `json:"ignore_statistics"` IgnoreStatistics aghalg.NullBool `json:"ignore_statistics"`
UpstreamsCacheSize uint32 `json:"upstreams_cache_size"`
UpstreamsCacheEnabled aghalg.NullBool `json:"upstreams_cache_enabled"`
} }
// copySettings returns a copy of specific settings from JSON or a previous // copySettings returns a copy of specific settings from JSON or a previous
// client. // client.
func (j *clientJSON) copySettings( func (j *clientJSON) copySettings(
prev *Client, prev *Client,
) (weekly *schedule.Weekly, ignoreQueryLog, ignoreStatistics bool) { ) (weekly *schedule.Weekly,
ignoreQueryLog,
ignoreStatistics,
upsCacheEnabled bool,
upsCacheSize uint32,
) {
if j.Schedule != nil { if j.Schedule != nil {
weekly = j.Schedule.Clone() weekly = j.Schedule.Clone()
} else if prev != nil && prev.BlockedServices != nil { } else if prev != nil && prev.BlockedServices != nil {
@ -83,7 +91,15 @@ func (j *clientJSON) copySettings(
ignoreStatistics = prev.IgnoreStatistics ignoreStatistics = prev.IgnoreStatistics
} }
return weekly, ignoreQueryLog, ignoreStatistics if j.UpstreamsCacheEnabled != aghalg.NBNull {
upsCacheEnabled = j.UpstreamsCacheEnabled == aghalg.NBTrue
upsCacheSize = j.UpstreamsCacheSize
} else if prev != nil {
upsCacheEnabled = prev.UpstreamsCacheEnabled
upsCacheSize = prev.UpstreamsCacheSize
}
return weekly, ignoreQueryLog, ignoreStatistics, upsCacheEnabled, upsCacheSize
} }
type runtimeClientJSON struct { type runtimeClientJSON struct {
@ -163,7 +179,7 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
} }
} }
weekly, ignoreQueryLog, ignoreStatistics := cj.copySettings(prev) weekly, ignoreQueryLog, ignoreStatistics, upsCacheEnabled, upsCacheSize := cj.copySettings(prev)
bs := &filtering.BlockedServices{ bs := &filtering.BlockedServices{
Schedule: weekly, Schedule: weekly,
@ -174,12 +190,6 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
return nil, fmt.Errorf("validating blocked services: %w", err) return nil, fmt.Errorf("validating blocked services: %w", err)
} }
var upsCacheEnabled bool
var upsCacheSize uint32
if prev != nil {
upsCacheEnabled, upsCacheSize = prev.UpstreamsCacheEnabled, prev.UpstreamsCacheSize
}
c = &Client{ c = &Client{
safeSearchConf: safeSearchConf, safeSearchConf: safeSearchConf,
@ -243,6 +253,9 @@ func clientToJSON(c *Client) (cj *clientJSON) {
IgnoreQueryLog: aghalg.BoolToNullBool(c.IgnoreQueryLog), IgnoreQueryLog: aghalg.BoolToNullBool(c.IgnoreQueryLog),
IgnoreStatistics: aghalg.BoolToNullBool(c.IgnoreStatistics), IgnoreStatistics: aghalg.BoolToNullBool(c.IgnoreStatistics),
UpstreamsCacheSize: c.UpstreamsCacheSize,
UpstreamsCacheEnabled: aghalg.BoolToNullBool(c.UpstreamsCacheEnabled),
} }
} }