Initialize log config earlier to prevent trace messages being printed early on (#1939)

like TRC DNS configuration loaded dns_config={....}
This commit is contained in:
Sandro authored and GitHub committed 2024-05-15 20:40:30 -04:00
1 parent 7fd2485000
commit a9763c9692
2 files changed
+6 -5

No files matched your search

+6 -3
View File
@@ -640,6 +640,9 @@ func GetHeadscaleConfig() (*Config, error) {
}, nil
}
logConfig := GetLogConfig()
zerolog.SetGlobalLevel(logConfig.Level)
prefix4, err := PrefixV4()
if err != nil {
return nil, err
@@ -667,7 +670,7 @@ func GetHeadscaleConfig() (*Config, error) {
dnsConfig, baseDomain := GetDNSConfig()
derpConfig := GetDERPConfig()
logConfig := GetLogTailConfig()
logTailConfig := GetLogTailConfig()
randomizeClientPort := viper.GetBool("randomize_client_port")
oidcClientSecret := viper.GetString("oidc.client_secret")
@@ -749,7 +752,7 @@ func GetHeadscaleConfig() (*Config, error) {
UseExpiryFromToken: viper.GetBool("oidc.use_expiry_from_token"),
},
LogTail: logConfig,
LogTail: logTailConfig,
RandomizeClientPort: randomizeClientPort,
ACL: GetACLConfig(),
@@ -761,7 +764,7 @@ func GetHeadscaleConfig() (*Config, error) {
Insecure: viper.GetBool("cli.insecure"),
},
Log: GetLogConfig(),
Log: logConfig,
// TODO(kradalby): Document these settings when more stable
Tuning: Tuning{