pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-05-06 02:47:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into refactor_acme

Browse source
This commit is contained in:
6543 2023-02-11 01:32:24 +01:00
commit 8b827239a5
No known key found for this signature in database
GPG key ID: B8BE6D610E61C862
3 changed files with 6 additions and 5 deletions
server
gitea
cache.go
upstream
domains.go

2
server/gitea/cache.go
View file

@ -80,7 +80,7 @@ type writeCacheReader struct {
func (t *writeCacheReader) Read(p []byte) (n int, err error) {
n, err = t.originalReader.Read(p)
if err != nil {
if err != nil && err != io.EOF {
log.Trace().Err(err).Msgf("[cache] original reader for %q has returned an error", t.cacheKey)
t.hasError = true
} else if n > 0 {

5
server/upstream/domains.go
View file

@ -1,6 +1,7 @@
package upstream
import (
"errors"
"strings"
"time"
@ -30,8 +31,8 @@ func (o *Options) CheckCanonicalDomain(giteaClient *gitea.Client, actualDomain,
}
body, err := giteaClient.GiteaRawContent(o.TargetOwner, o.TargetRepo, o.TargetBranch, canonicalDomainConfig)
if err == nil || err == gitea.ErrorNotFound {
log.Info().Err(err).Msgf("could not read %s of %s/%s", canonicalDomainConfig, o.TargetOwner, o.TargetRepo)
if err != nil && !errors.Is(err, gitea.ErrorNotFound) {
log.Error().Err(err).Msgf("could not read %s of %s/%s", canonicalDomainConfig, o.TargetOwner, o.TargetRepo)
}
var domains []string