From 4948aa106b9a02830554b664e2ec761270cb42c9 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Thu, 2 Nov 2023 12:31:57 +0100 Subject: [PATCH] [MM-54403] Introduce separate AdvanctedLogging levels for LDAP messages (#24873) --- server/channels/api4/ldap.go | 2 +- server/public/shared/mlog/levels.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/server/channels/api4/ldap.go b/server/channels/api4/ldap.go index b22fa318f5..fe98c7eb37 100644 --- a/server/channels/api4/ldap.go +++ b/server/channels/api4/ldap.go @@ -55,7 +55,7 @@ func syncLdap(c *Context, w http.ResponseWriter, r *http.Request) { var opts LdapSyncOptions err := json.NewDecoder(r.Body).Decode(&opts) if err != nil { - c.Logger.Warn("Error decoding LDAP sync options", mlog.Err(err)) + c.Logger.LogM(mlog.MlvlLDAPInfo, "Error decoding LDAP sync options", mlog.Err(err)) } auditRec := c.MakeAuditRecord("syncLdap", audit.Fail) diff --git a/server/public/shared/mlog/levels.go b/server/public/shared/mlog/levels.go index f640ea82a9..df7264255b 100644 --- a/server/public/shared/mlog/levels.go +++ b/server/public/shared/mlog/levels.go @@ -37,6 +37,13 @@ var ( LvlRemoteClusterServiceError = Level{ID: 131, Name: "RemoteClusterServiceError"} LvlRemoteClusterServiceWarn = Level{ID: 132, Name: "RemoteClusterServiceWarn"} + // used by LDAP sync job + LvlLDAPError = Level{ID: 140, Name: "LDAPError"} + LvlLDAPWarn = Level{ID: 141, Name: "LDAPWarn"} + LvlLDAPInfo = Level{ID: 142, Name: "LDAPInfo"} + LvlLDAPDebug = Level{ID: 143, Name: "LDAPDebug"} + LvlLDAPTrace = Level{ID: 144, Name: "LDAPTrace"} + // used by Shared Channel Sync Service LvlSharedChannelServiceDebug = Level{ID: 200, Name: "SharedChannelServiceDebug"} LvlSharedChannelServiceError = Level{ID: 201, Name: "SharedChannelServiceError"} @@ -48,4 +55,9 @@ var ( // Combinations for LogM (log multi). var ( MLvlAuditAll = []Level{LvlAuditAPI, LvlAuditContent, LvlAuditPerms, LvlAuditCLI} + + MlvlLDAPError = []Level{LvlError, LvlLDAPError} + MlvlLDAPWarn = []Level{LvlWarn, LvlLDAPWarn} + MlvlLDAPInfo = []Level{LvlInfo, LvlLDAPInfo} + MlvlLDAPDebug = []Level{LvlDebug, LvlLDAPDebug} )