diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
| commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
| tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /app/plugin/ldapextras | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
| download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/plugin/ldapextras')
| -rw-r--r-- | app/plugin/ldapextras/plugin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/plugin/ldapextras/plugin.go b/app/plugin/ldapextras/plugin.go index 3af55c2ac..e0645b68e 100644 --- a/app/plugin/ldapextras/plugin.go +++ b/app/plugin/ldapextras/plugin.go @@ -8,10 +8,10 @@ import ( "net/http" "sync/atomic" - l4g "github.com/alecthomas/log4go" "github.com/gorilla/mux" "github.com/mattermost/mattermost-server/app/plugin" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -34,7 +34,7 @@ func (p *Plugin) config() *Configuration { func (p *Plugin) OnConfigurationChange() { var configuration Configuration if err := p.api.LoadPluginConfiguration(&configuration); err != nil { - l4g.Error(err.Error()) + mlog.Error(err.Error()) } p.configuration.Store(&configuration) } |