c53ad052d8
Some bugs caused by less unit tests in fundamental packages. This PR refactor `setting` package so that create a unit test will be easier than before. - All `LoadFromXXX` files has been splited as two functions, one is `InitProviderFromXXX` and `LoadCommonSettings`. The first functions will only include the code to create or new a ini file. The second function will load common settings. - It also renames all functions in setting from `newXXXService` to `loadXXXSetting` or `loadXXXFrom` to make the function name less confusing. - Move `XORMLog` to `SQLLog` because it's a better name for that. Maybe we should finally move these `loadXXXSetting` into the `XXXInit` function? Any idea? --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de>
38 lines
804 B
Go
38 lines
804 B
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"net/url"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
)
|
|
|
|
// Proxy settings
|
|
var Proxy = struct {
|
|
Enabled bool
|
|
ProxyURL string
|
|
ProxyURLFixed *url.URL
|
|
ProxyHosts []string
|
|
}{
|
|
Enabled: false,
|
|
ProxyURL: "",
|
|
ProxyHosts: []string{},
|
|
}
|
|
|
|
func loadProxyFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("proxy")
|
|
Proxy.Enabled = sec.Key("PROXY_ENABLED").MustBool(false)
|
|
Proxy.ProxyURL = sec.Key("PROXY_URL").MustString("")
|
|
if Proxy.ProxyURL != "" {
|
|
var err error
|
|
Proxy.ProxyURLFixed, err = url.Parse(Proxy.ProxyURL)
|
|
if err != nil {
|
|
log.Error("Global PROXY_URL is not valid")
|
|
Proxy.ProxyURL = ""
|
|
}
|
|
}
|
|
Proxy.ProxyHosts = sec.Key("PROXY_HOSTS").Strings(",")
|
|
}
|