forked from forgejo/forgejo
API error cleanup (#7186)
This commit is contained in:
parent
744fd6a1c8
commit
8f0182c322
7 changed files with 16 additions and 25 deletions
|
@ -297,12 +297,14 @@ var (
|
|||
// API settings
|
||||
API = struct {
|
||||
EnableSwagger bool
|
||||
SwaggerURL string
|
||||
MaxResponseItems int
|
||||
DefaultPagingNum int
|
||||
DefaultGitTreesPerPage int
|
||||
DefaultMaxBlobSize int64
|
||||
}{
|
||||
EnableSwagger: true,
|
||||
SwaggerURL: "",
|
||||
MaxResponseItems: 50,
|
||||
DefaultPagingNum: 30,
|
||||
DefaultGitTreesPerPage: 1000,
|
||||
|
@ -581,17 +583,17 @@ func NewContext() {
|
|||
AppURL = strings.TrimRight(AppURL, "/") + "/"
|
||||
|
||||
// Check if has app suburl.
|
||||
url, err := url.Parse(AppURL)
|
||||
appURL, err := url.Parse(AppURL)
|
||||
if err != nil {
|
||||
log.Fatal("Invalid ROOT_URL '%s': %s", AppURL, err)
|
||||
}
|
||||
// Suburl should start with '/' and end without '/', such as '/{subpath}'.
|
||||
// This value is empty if site does not have sub-url.
|
||||
AppSubURL = strings.TrimSuffix(url.Path, "/")
|
||||
AppSubURL = strings.TrimSuffix(appURL.Path, "/")
|
||||
AppSubURLDepth = strings.Count(AppSubURL, "/")
|
||||
// Check if Domain differs from AppURL domain than update it to AppURL's domain
|
||||
// TODO: Can be replaced with url.Hostname() when minimal GoLang version is 1.8
|
||||
urlHostname := strings.SplitN(url.Host, ":", 2)[0]
|
||||
urlHostname := strings.SplitN(appURL.Host, ":", 2)[0]
|
||||
if urlHostname != Domain && net.ParseIP(urlHostname) == nil {
|
||||
Domain = urlHostname
|
||||
}
|
||||
|
@ -900,6 +902,10 @@ func NewContext() {
|
|||
log.Fatal("Failed to map Metrics settings: %v", err)
|
||||
}
|
||||
|
||||
u := *appURL
|
||||
u.Path = path.Join(u.Path, "api", "swagger")
|
||||
API.SwaggerURL = u.String()
|
||||
|
||||
newCron()
|
||||
newGit()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue