Skip to content

Commit 67df10c

Browse files
committed
Fix param accessor usage in SetServerDefaults to read from viper instance
1 parent 694ae0d commit 67df10c

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

config/config.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,14 +1489,16 @@ func SetServerDefaults(v *viper.Viper) error {
14891489
v.SetDefault(param.Cache_Port.GetName(), xrootdPort)
14901490
}
14911491

1492-
if param.Origin_Port.GetInt() != 443 {
1493-
v.SetDefault(param.Origin_Url.GetName(), fmt.Sprintf("https://%v:%v", v.GetString(param.Server_Hostname.GetName()), param.Origin_Port.GetInt()))
1492+
originPort := v.GetInt(param.Origin_Port.GetName())
1493+
if originPort != 443 {
1494+
v.SetDefault(param.Origin_Url.GetName(), fmt.Sprintf("https://%v:%v", v.GetString(param.Server_Hostname.GetName()), originPort))
14941495
} else {
14951496
v.SetDefault(param.Origin_Url.GetName(), fmt.Sprintf("https://%v", v.GetString(param.Server_Hostname.GetName())))
14961497
}
14971498

1498-
if param.Cache_Port.GetInt() != 443 {
1499-
v.SetDefault(param.Cache_Url.GetName(), fmt.Sprintf("https://%v:%v", v.GetString(param.Server_Hostname.GetName()), param.Cache_Port.GetInt()))
1499+
cachePort := v.GetInt(param.Cache_Port.GetName())
1500+
if cachePort != 443 {
1501+
v.SetDefault(param.Cache_Url.GetName(), fmt.Sprintf("https://%v:%v", v.GetString(param.Server_Hostname.GetName()), cachePort))
15001502
} else {
15011503
v.SetDefault(param.Cache_Url.GetName(), fmt.Sprintf("https://%v", v.GetString(param.Server_Hostname.GetName())))
15021504
}

0 commit comments

Comments
 (0)