Skip to content

updating isEnvExist to return false if empty #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2023
Merged

updating isEnvExist to return false if empty #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/TibiaDataUtils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ func TibiaDataSanitize0026String(data string) string {
return strings.ReplaceAll(data, "\u0026#39;", "'")
}

// isEnvExist func - check if environment var is set
func isEnvExist(key string) (ok bool) {
_, ok = os.LookupEnv(key)
return
// isEnvExist func - check if environment var is set and not empty
func isEnvExist(key string) bool {
data, ok := os.LookupEnv(key)
return ok && data != ""
}

// getEnv func - read an environment or return a default value
Expand Down
15 changes: 7 additions & 8 deletions src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,24 +104,23 @@ func TibiaDataInitializer() {
}

// Adding information of host
TibiaDataHost = getEnv("TIBIADATA_HOST", "")
if TibiaDataHost != "" {
TibiaDataHost = "+https://" + TibiaDataHost
if isEnvExist("TIBIADATA_HOST") {
TibiaDataHost = "+https://" + getEnv("TIBIADATA_HOST", "")
}

// Setting TibiaDataProxyDomain
if isEnvExist("TIBIADATA_PROXY") {

TibiaDataProxyProtocol := "https"
if isEnvExist("TIBIADATA_PROXY_PROTOCOL") {
TibiaDataProxyProtocol = getEnv("TIBIADATA_PROXY_PROTOCOL", "https")
TibiaDataProxyProtocol := getEnv("TIBIADATA_PROXY_PROTOCOL", "https")
switch TibiaDataProxyProtocol {
case "http":
TibiaDataProxyProtocol = "http"
}

TibiaDataProxyDomain = TibiaDataProxyProtocol + "://" + getEnv("TIBIADATA_PROXY", "www.tibia.com") + "/"
log.Printf("[info] TibiaData API proxy: %s", TibiaDataProxyDomain)
}

log.Printf("[info] TibiaData API proxy: %s", TibiaDataProxyDomain)

// Run some functions that are empty but required for documentation to be done
_ = tibiaNewslistArchive()
_ = tibiaNewslistArchiveDays()
Expand Down
4 changes: 2 additions & 2 deletions src/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ func runWebServer() {
})

// Set proxy feature of gin
trustedProxies := getEnv("GIN_TRUSTED_PROXIES", "")
if len(trustedProxies) > 0 {
if isEnvExist("GIN_TRUSTED_PROXIES") {
trustedProxies := getEnv("GIN_TRUSTED_PROXIES", "")
_ = router.SetTrustedProxies(strings.Split(trustedProxies, ","))
log.Printf("[info] TibiaData API gin-trusted-proxies: %s", strings.Split(trustedProxies, ","))
} else {
Expand Down