log instrumentation & test package (#10371)
This PR is part of #4767. It contains * add log to federation services * separat test package for test (fix dependency cycles) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10371 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Michael Jerger <michael.jerger@meissa-gmbh.de> Co-committed-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
This commit is contained in:
committed by
Mathieu Fenniak
parent
590104b5ca
commit
9cff7ebde5
@@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
"forgejo.org/models/db"
|
||||
"forgejo.org/modules/log"
|
||||
"forgejo.org/modules/validation"
|
||||
)
|
||||
|
||||
@@ -16,6 +17,7 @@ func init() {
|
||||
}
|
||||
|
||||
func GetFederationHost(ctx context.Context, ID int64) (*FederationHost, error) {
|
||||
log.Trace("GetFederationHost: %v", ID)
|
||||
host := new(FederationHost)
|
||||
has, err := db.GetEngine(ctx).Where("id=?", ID).Get(host)
|
||||
if err != nil {
|
||||
@@ -26,6 +28,7 @@ func GetFederationHost(ctx context.Context, ID int64) (*FederationHost, error) {
|
||||
if res, err := validation.IsValid(host); !res {
|
||||
return nil, err
|
||||
}
|
||||
log.Trace("GetFederationHost: %v, got host %v", ID, host)
|
||||
return host, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -118,6 +118,7 @@ func GetFederatedUserByUserID(ctx context.Context, userID int64) (*User, *Federa
|
||||
}
|
||||
|
||||
func FindFederatedUserByKeyID(ctx context.Context, keyID string) (*User, *FederatedUser, error) {
|
||||
log.Trace("FindFederatedUserByKeyID: %v", keyID)
|
||||
federatedUser := new(FederatedUser)
|
||||
user := new(User)
|
||||
has, err := db.GetEngine(ctx).Where("key_id=?", keyID).Get(federatedUser)
|
||||
@@ -140,6 +141,7 @@ func FindFederatedUserByKeyID(ctx context.Context, keyID string) (*User, *Federa
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
log.Trace("FindFederatedUserByKeyID: %v found user.ID %v, federated_user %v", keyID, user.ID, federatedUser)
|
||||
return user, federatedUser, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user