devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 08:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
like TRC DNS configuration loaded dns_config={....}
This commit is contained in:
Sandro 2024-05-16 02:40:30 +02:00 committed by GitHub
parent 7fd2485000
commit a9763c9692
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/headscale/cli/root.go
View file

@ -56,8 +56,6 @@ func initConfig() {
machineOutput := HasMachineOutputFlag() machineOutput := HasMachineOutputFlag()
zerolog.SetGlobalLevel(cfg.Log.Level)
// If the user has requested a "node" readable format, // If the user has requested a "node" readable format,
// then disable login so the output remains valid. // then disable login so the output remains valid.
if machineOutput { if machineOutput {

9
hscontrol/types/config.go
View file

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