aljaz/haven
1
0
Fork 0
mirror of https://github.com/aljazceru/haven.git synced 2025-12-18 22:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from HolgerHatGarKeineNode/feature/relay-lists-from-file

Browse Source 
JSON file is parsed and used if it exists
This commit is contained in:
Barry Deen
2024-10-08 11:01:45 -04:00
committed by GitHub
parent a8dcf91e4c 600491ddf3
commit aa59597297
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config.go
View File

@@ -54,13 +54,16 @@ type AwsConfig struct {
func getRelayListFromEnvOrFile(envKey, fileKey string) []string {
envValue := getEnv(envKey)
if envValue != "" {
return getRelayList(envValue)
filePath := getEnv(fileKey)
if filePath != "" {
if _, err := os.Stat(filePath); err == nil {
return getRelayListFromFile(filePath)
}
}
filePath := getEnv(fileKey)
if filePath != "" {
return getRelayListFromFile(filePath)
if envValue != "" {
return getRelayList(envValue)
}
return []string{}
@@ -127,7 +130,11 @@ func getRelayListFromFile(filePath string) []string {
}
for i, relay := range relayList {
relayList[i] = "wss://" + strings.TrimSpace(relay)
relay = strings.TrimSpace(relay)
if !strings.HasPrefix(relay, "wss://") && !strings.HasPrefix(relay, "ws://") {
relay = "wss://" + relay
}
relayList[i] = relay
}
return relayList
}