opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5733 from swordqiu/hotfix/qj-idp-log-event

Browse Source 
fix: idp log connected/disconnected event
This commit is contained in:
Zexi Li
2020-04-08 21:51:36 +08:00
committed by GitHub
parent 62d1c0729b 528decfa90
commit b274871f7c
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/identity_provider.go
+21 -11
View File
@@ -177,25 +177,35 @@ func (ident *SIdentityProvider) SetSyncStatus(ctx context.Context, userCred mccl
}
func (ident *SIdentityProvider) MarkConnected(ctx context.Context, userCred mcclient.TokenCredential) error {
_, err := db.UpdateWithLock(ctx, ident, func() error {
ident.ErrorCount = 0
return nil
})
if err != nil {
return err
if ident.ErrorCount > 0 {
_, err := db.UpdateWithLock(ctx, ident, func() error {
ident.ErrorCount = 0
return nil
})
if err != nil {
return errors.Wrap(err, "UpdateWithLock")
}
}
return ident.SetStatus(userCred, api.IdentityDriverStatusConnected, "")
if ident.Status != api.IdentityDriverStatusConnected {
logclient.AddSimpleActionLog(ident, logclient.ACT_ENABLE, nil, userCred, true)
return ident.SetStatus(userCred, api.IdentityDriverStatusConnected, "")
}
return nil
}
func (ident *SIdentityProvider) MarkDisconnected(ctx context.Context, userCred mcclient.TokenCredential) error {
func (ident *SIdentityProvider) MarkDisconnected(ctx context.Context, userCred mcclient.TokenCredential, reason error) error {
_, err := db.UpdateWithLock(ctx, ident, func() error {
ident.ErrorCount = ident.ErrorCount + 1
return nil
})
if err != nil {
return err
return errors.Wrap(err, "UpdateWithLock")
}
return ident.SetStatus(userCred, api.IdentityDriverStatusDisconnected, "")
logclient.AddSimpleActionLog(ident, logclient.ACT_DISABLE, reason.Error(), userCred, false)
if ident.Status != api.IdentityDriverStatusDisconnected {
return ident.SetStatus(userCred, api.IdentityDriverStatusDisconnected, reason.Error())
}
return nil
}
func (self *SIdentityProvider) AllowGetDetailsConfig(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
@@ -229,7 +239,7 @@ func (ident *SIdentityProvider) PerformConfig(ctx context.Context, userCred mccl
if err != nil {
return nil, httperrors.NewInternalServerError("saveConfig fail %s", err)
}
ident.MarkDisconnected(ctx, userCred)
ident.MarkDisconnected(ctx, userCred, fmt.Errorf("change config"))
submitIdpSyncTask(ctx, userCred, ident)
return ident.GetDetailsConfig(ctx, userCred, query)
}
pkg/keystone/models/syncworker.go
+3 -3
View File
@@ -47,19 +47,19 @@ func submitIdpSyncTask(ctx context.Context, userCred mcclient.TokenCredential, i
conf, err := GetConfigs(idp, true, nil, nil)
if err != nil {
log.Errorf("GetConfig for idp %s fail %s", idp.Name, err)
idp.MarkDisconnected(ctx, userCred)
idp.MarkDisconnected(ctx, userCred, err)
return
}
driver, err := driver.GetDriver(idp.Driver, idp.Id, idp.Name, idp.Template, idp.TargetDomainId, idp.AutoCreateProject.Bool(), conf)
if err != nil {
log.Errorf("GetDriver for idp %s fail %s", idp.Name, err)
idp.MarkDisconnected(ctx, userCred)
idp.MarkDisconnected(ctx, userCred, err)
return
}
err = driver.Probe(ctx)
if err != nil {
log.Errorf("Probe for idp %s fail %s", idp.Name, err)
idp.MarkDisconnected(ctx, userCred)
idp.MarkDisconnected(ctx, userCred, err)
return
}