SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

rejig logging a bit

This commit is contained in:
tobi 2024-04-16 12:44:40 +02:00
parent 9ff5e0cbab
commit 9d15127841
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/federation/dereferencing/account.go
View File

@ -1062,10 +1062,9 @@ func (d *Dereferencer) fetchRemoteAccountStats(ctx context.Context, account *gts
account.FollowersURI,
requestUser,
); err != nil {
// Something up with the URL,
// log this but don't bail.
log.Errorf(ctx,
"bad followers URI for account @%s@%s: %v",
// Log this but don't bail.
log.Warnf(ctx,
"couldn't count followers for @%s@%s: %v",
account.Username, account.Domain, err,
)
} else if count > 0 {
@ -1079,10 +1078,9 @@ func (d *Dereferencer) fetchRemoteAccountStats(ctx context.Context, account *gts
account.FollowingURI,
requestUser,
); err != nil {
// Something up with the URL,
// log this but don't bail.
log.Errorf(ctx,
"bad following URI for account @%s@%s: %v",
// Log this but don't bail.
log.Warnf(ctx,
"couldn't count following for @%s@%s: %v",
account.Username, account.Domain, err,
)
} else if count > 0 {
@ -1096,10 +1094,9 @@ func (d *Dereferencer) fetchRemoteAccountStats(ctx context.Context, account *gts
account.OutboxURI,
requestUser,
); err != nil {
// Something up with the URL,
// log this but don't bail.
log.Errorf(ctx,
"bad outbox URI for account @%s@%s: %v",
// Log this but don't bail.
log.Warnf(ctx,
"couldn't count statuses for @%s@%s: %v",
account.Username, account.Domain, err,
)
} else if count > 0 {
@ -1127,13 +1124,8 @@ func (d *Dereferencer) fetchRemoteAccountStats(ctx context.Context, account *gts
// a positive integer, or -1 if total items
// cannot be counted.
//
// Only returns an error if provided uriStr
// is not empty and not parseable. Actual
// dereferencing errors are ignored, on the
// basis that it's not a show stopper if an
// error occurs since these numbers are not
// very important, but malformed URIs are
// kind of significant.
// Error will be returned for invalid non-empty
// URIs or dereferencing isses.
func (d *Dereferencer) countCollection(
ctx context.Context,
uriStr string,
@ -1150,13 +1142,7 @@ func (d *Dereferencer) countCollection(
collect, err := d.dereferenceCollection(ctx, requestUser, uri)
if err != nil {
// Just log for debug, we don't
// mind if we can't fetch this.
log.Debugf(ctx,
"error dereferencing %s: %v",
uriStr, err,
)
return -1, nil
return -1, err
}
return collect.TotalItems(), nil

2
internal/federation/dereferencing/collection.go
View File

@ -40,7 +40,7 @@ func (d *Dereferencer) dereferenceCollection(ctx context.Context, username strin
rsp, err := transport.Dereference(ctx, pageIRI)
if err != nil {
return nil, gtserror.Newf("error deferencing %s: %w", pageIRI.String(), err)
return nil, gtserror.Newf("error dereferencing %s: %w", pageIRI.String(), err)
}
collect, err := ap.ResolveCollection(ctx, rsp.Body)