mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-30 18:17:55 +00:00 
			
		
		
		
	Allow most parts of Vault's logging to have its level changed on-the-fly (#5280)
* Allow most parts of Vault's logging to have its level changed on-the-fly * Use a const for not set
This commit is contained in:
		| @@ -53,6 +53,8 @@ type Config struct { | ||||
|  | ||||
| 	PluginDirectory string `hcl:"plugin_directory"` | ||||
|  | ||||
| 	LogLevel string `hcl:"log_level"` | ||||
|  | ||||
| 	PidFile              string      `hcl:"pid_file"` | ||||
| 	EnableRawEndpoint    bool        `hcl:"-"` | ||||
| 	EnableRawEndpointRaw interface{} `hcl:"raw_storage_endpoint"` | ||||
| @@ -299,6 +301,11 @@ func (c *Config) Merge(c2 *Config) *Config { | ||||
| 		result.DefaultMaxRequestDuration = c2.DefaultMaxRequestDuration | ||||
| 	} | ||||
|  | ||||
| 	result.LogLevel = c.LogLevel | ||||
| 	if c2.LogLevel != "" { | ||||
| 		result.LogLevel = c2.LogLevel | ||||
| 	} | ||||
|  | ||||
| 	result.ClusterName = c.ClusterName | ||||
| 	if c2.ClusterName != "" { | ||||
| 		result.ClusterName = c2.ClusterName | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Jeff Mitchell
					Jeff Mitchell