pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-25 22:36:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into issue115

Browse source
This commit is contained in:
6543 2022-11-11 15:03:01 +01:00
commit 06bde50161
6 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/handler.go
View file

@ -86,7 +86,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
// also disallow search indexing and add a Link header to the canonical URL.
tryBranch := func(log zerolog.Logger, repo, branch string, path []string, canonicalLink string) bool {
if repo == "" {
log.Debug().Msg("tryBranch: repo is empty")
log.Warn().Msg("tryBranch: repo is empty")
return false
}
@ -97,7 +97,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
// Check if the branch exists, otherwise treat it as a file path
branchTimestampResult := upstream.GetBranchTimestamp(giteaClient, targetOwner, repo, branch, branchTimestampCache)
if branchTimestampResult == nil {
log.Debug().Msg("tryBranch: branch doesn't exist")
log.Warn().Msg("tryBranch: branch doesn't exist")
return false
}
@ -299,7 +299,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
return
}
log.Info().Msg("tryBranch, now trying upstream 7 %s")
log.Info().Msg("tryBranch, now trying upstream 7")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)