diff options
author | Corey Hulen <corey@hulen.com> | 2017-09-25 13:30:33 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 13:30:33 -0700 |
commit | 81c18a01bd22437457da04b6cdb8d409beb54446 (patch) | |
tree | 1c1a28dc72fe8685259870e53643de9f558dad79 /app | |
parent | 1bf2a2e8d5a552d23e16379e73c2d4aaefc9368f (diff) | |
download | chat-81c18a01bd22437457da04b6cdb8d409beb54446.tar.gz chat-81c18a01bd22437457da04b6cdb8d409beb54446.tar.bz2 chat-81c18a01bd22437457da04b6cdb8d409beb54446.zip |
PLT-7542 Converting LDAP sync to the job server (#7452)
* PLT-7542 Converting LDAP sync to the job server
* Fixing minor issues
* Fixing build failure
* Translate error message
* Translate error message
* Translate error message
* Translate error message
* Fixing merge
* Fixing bad merge
Diffstat (limited to 'app')
-rw-r--r-- | app/app.go | 2 | ||||
-rw-r--r-- | app/ldap.go | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/app.go b/app/app.go index 1289e4a6d..eaaf9acee 100644 --- a/app/app.go +++ b/app/app.go @@ -102,8 +102,6 @@ func (a *App) initEnterprise() { if err := utils.ValidateLdapFilter(cfg, a.Ldap); err != nil { panic(utils.T(err.Id)) } - - a.Ldap.StartLdapSyncJob() }) } if metricsInterface != nil { diff --git a/app/ldap.go b/app/ldap.go index 279ea3708..96791168e 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -15,7 +15,7 @@ func (a *App) SyncLdap() { go func() { if utils.IsLicensed() && *utils.License().Features.LDAP && *utils.Cfg.LdapSettings.Enable { if ldapI := a.Ldap; ldapI != nil { - ldapI.SyncNow() + ldapI.StartSynchronizeJob(false) } else { l4g.Error("%v", model.NewAppError("SyncLdap", "ent.ldap.disabled.app_error", nil, "", http.StatusNotImplemented).Error()) } |