yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Better user load logs

Browse Source
This commit is contained in:
James Houlahan
2023-01-19 17:47:45 +01:00
parent c9c80fd861
commit d26a8319b6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/bridge/user.go
View File

@ -329,30 +329,36 @@ func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, auth
// loadUsers tries to load each user in the vault that isn't already loaded. // loadUsers tries to load each user in the vault that isn't already loaded.
func (bridge *Bridge) loadUsers(ctx context.Context) error { func (bridge *Bridge) loadUsers(ctx context.Context) error {
logrus.WithField("count", len(bridge.vault.GetUserIDs())).Info("Loading users")
return bridge.vault.ForUser(runtime.NumCPU(), func(user *vault.User) error { return bridge.vault.ForUser(runtime.NumCPU(), func(user *vault.User) error {
log := logrus.WithField("userID", user.UserID())
if user.AuthUID() == "" { if user.AuthUID() == "" {
log.Info("Not loading disconnected user")
return nil return nil
} }
if safe.RLockRet(func() bool { return mapHas(bridge.users, user.UserID()) }, bridge.usersLock) { if safe.RLockRet(func() bool { return mapHas(bridge.users, user.UserID()) }, bridge.usersLock) {
log.Debug("Not loading already-loaded user")
return nil return nil
} }
logrus.WithField("userID", user.UserID()).Info("Loading connected user") log.Info("Loading connected user")
bridge.publish(events.UserLoading{ bridge.publish(events.UserLoading{
UserID: user.UserID(), UserID: user.UserID(),
}) })
if err := bridge.loadUser(ctx, user); err != nil { if err := bridge.loadUser(ctx, user); err != nil {
logrus.WithError(err).Error("Failed to load connected user") log.WithError(err).Error("Failed to load connected user")
bridge.publish(events.UserLoadFail{ bridge.publish(events.UserLoadFail{
UserID: user.UserID(), UserID: user.UserID(),
Error: err, Error: err,
}) })
} else { } else {
logrus.WithField("userID", user.UserID()).Info("Successfully loaded user") log.Info("Successfully loaded connected user")
bridge.publish(events.UserLoadSuccess{ bridge.publish(events.UserLoadSuccess{
UserID: user.UserID(), UserID: user.UserID(),