Merge pull request #2963 from lifenjoiner/log

jedisct1 · web-flow · commit b9639fac23e8 · 2025-09-14T10:47:07.000+02:00
diff --git a/dnscrypt-proxy/plugin_query_log.go b/dnscrypt-proxy/plugin_query_log.go
@@ -85,8 +85,10 @@ func (plugin *PluginQueryLog) Eval(pluginsState *PluginsState, msg *dns.Msg) err
 	}
 
 	// Cap at timeout to handle system sleep/suspend
-	if requestDuration > pluginsState.timeout {
-		requestDuration = pluginsState.timeout
+	// Max: UDP + TCP, Dial + (write + read)
+	triedUDPTCPTimeout := 4 * pluginsState.timeout
+	if requestDuration > triedUDPTCPTimeout {
+		requestDuration = triedUDPTCPTimeout
 	}
 	var line string
 	if plugin.format == "tsv" {

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,10 @@ func (plugin PluginQueryLog) Eval(pluginsState PluginsState, msg *dns.Msg) err`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Cap at timeout to handle system sleep/suspend`
`88`		`- if requestDuration > pluginsState.timeout {`
`89`		`- requestDuration = pluginsState.timeout`
	`88`	`+ // Max: UDP + TCP, Dial + (write + read)`
	`89`	`+ triedUDPTCPTimeout := 4 * pluginsState.timeout`
	`90`	`+ if requestDuration > triedUDPTCPTimeout {`
	`91`	`+ requestDuration = triedUDPTCPTimeout`
`90`	`92`	`}`
`91`	`93`	`var line string`
`92`	`94`	`if plugin.format == "tsv" {`