public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LDAP: consistently name the LDAP entities (#17203)

Browse Source
This commit is contained in:
Oleg Gaidarenko
2019-05-22 15:30:03 +03:00
committed by GitHub
parent 87688930a2
commit 9b7f9dd9be
17 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ldap/settings.go
+4 -4
View File
@@ -65,7 +65,7 @@ var loadingMutex = &sync.Mutex{}
// IsEnabled checks if ldap is enabled
func IsEnabled() bool {
return setting.LdapEnabled
return setting.LDAPEnabled
}
// ReloadConfig reads the config from the disc and caches it.
@@ -78,7 +78,7 @@ func ReloadConfig() error {
defer loadingMutex.Unlock()
var err error
config, err = readConfig(setting.LdapConfigFile)
config, err = readConfig(setting.LDAPConfigFile)
return err
}
@@ -98,7 +98,7 @@ func GetConfig() (*Config, error) {
defer loadingMutex.Unlock()
var err error
config, err = readConfig(setting.LdapConfigFile)
config, err = readConfig(setting.LDAPConfigFile)
return config, err
}
@@ -106,7 +106,7 @@ func GetConfig() (*Config, error) {
func readConfig(configFile string) (*Config, error) {
result := &Config{}
logger.Info("Ldap enabled, reading config file", "file", configFile)
logger.Info("LDAP enabled, reading config file", "file", configFile)
_, err := toml.DecodeFile(configFile, result)
if err != nil {