From 8e19ba029f889519d93cf272960dce858971106c Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 18 Oct 2017 15:36:43 -0700 Subject: Reduce utils.Cfg references (#7650) * app.UpdateConfig method * test fix * another test fix * the config override option as-was is just error prone, remove it for now * derp --- app/ldap.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/ldap.go') diff --git a/app/ldap.go b/app/ldap.go index 119587866..f1d46f824 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -13,7 +13,7 @@ import ( func (a *App) SyncLdap() { a.Go(func() { - if utils.IsLicensed() && *utils.License().Features.LDAP && *utils.Cfg.LdapSettings.Enable { + if utils.IsLicensed() && *utils.License().Features.LDAP && *a.Config().LdapSettings.Enable { if ldapI := a.Ldap; ldapI != nil { ldapI.StartSynchronizeJob(false) } else { @@ -24,7 +24,7 @@ func (a *App) SyncLdap() { } func (a *App) TestLdap() *model.AppError { - if ldapI := a.Ldap; ldapI != nil && utils.IsLicensed() && *utils.License().Features.LDAP && *utils.Cfg.LdapSettings.Enable { + if ldapI := a.Ldap; ldapI != nil && utils.IsLicensed() && *utils.License().Features.LDAP && *a.Config().LdapSettings.Enable { if err := ldapI.RunTest(); err != nil { err.StatusCode = 500 return err -- cgit v1.2.3-1-g7c22