feat: Prefer environment variable than config or console argument

siketyan · siketyan · commit 91696a4e4fa5 · 2023-02-08T17:28:28.000+09:00
diff --git a/commands/local_server_start.go b/commands/local_server_start.go
@@ -176,8 +176,8 @@ var localServerStartCmd = &console.Command{
 
 		// If 'SSLKEYLOGFILE' environment variable is set, uses this as a destination of TLS key log.
 		// In this context, the name 'SSLKEYLOGFILE' is common, so using 'SSL' instead of 'TLS' name.
-		// The key log file from the console argument or YAML config is preferred than the environment variable.
-		if path := os.Getenv("SSLKEYLOGFILE"); path != "" && config.TlsKeyLogFile == "" {
+		// This environment variable is preferred than the key log file from the console argument.
+		if path := os.Getenv("SSLKEYLOGFILE"); path != "" {
 			config.TlsKeyLogFile = path
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,8 @@ var localServerStartCmd = &console.Command{`
`176`	`176`
`177`	`177`	`// If 'SSLKEYLOGFILE' environment variable is set, uses this as a destination of TLS key log.`
`178`	`178`	`// In this context, the name 'SSLKEYLOGFILE' is common, so using 'SSL' instead of 'TLS' name.`
`179`		`- // The key log file from the console argument or YAML config is preferred than the environment variable.`
`180`		`- if path := os.Getenv("SSLKEYLOGFILE"); path != "" && config.TlsKeyLogFile == "" {`
	`179`	`+ // This environment variable is preferred than the key log file from the console argument.`
	`180`	`+ if path := os.Getenv("SSLKEYLOGFILE"); path != "" {`
`181`	`181`	`config.TlsKeyLogFile = path`
`182`	`182`	`}`
`183`	`183`