upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-45065] Switch all api4 methods to use the new logger (#24896)

Browse source
This commit is contained in:
Ben Schumacher 2023-10-31 11:00:22 +01:00 committed by GitHub
parent 3812de0dec
commit a4ece51391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/channels/api4/apitestlib.go
View file

@ -201,7 +201,7 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
falseValues := []string{"0", "f", "F", "FALSE", "false", "False"}
trueString := trueValues[rand.Intn(len(trueValues))]
falseString := falseValues[rand.Intn(len(falseValues))]
mlog.Debug("Configured Client4 bool string values", mlog.String("true", trueString), mlog.String("false", falseString))
testLogger.Debug("Configured Client4 bool string values", mlog.String("true", trueString), mlog.String("false", falseString))
th.Client.SetBoolString(true, trueString)
th.Client.SetBoolString(false, falseString)

4
server/channels/api4/cloud.go
View file

@ -319,7 +319,7 @@ func validateWorkspaceBusinessEmail(c *Context, w http.ResponseWriter, r *http.R
c.Err = model.NewAppError("Api4.validateWorkspaceBusinessEmail", "api.cloud.request_error", nil, errValidatingAdminEmail.Error(), http.StatusForbidden)
emailResp := model.ValidateBusinessEmailResponse{IsValid: false}
if err := json.NewEncoder(w).Encode(emailResp); err != nil {
mlog.Warn("Error while writing response", mlog.Err(err))
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
return
}
@ -328,7 +328,7 @@ func validateWorkspaceBusinessEmail(c *Context, w http.ResponseWriter, r *http.R
// if any of the emails is valid, return ok
emailResp := model.ValidateBusinessEmailResponse{IsValid: true}
if err := json.NewEncoder(w).Encode(emailResp); err != nil {
mlog.Warn("Error while writing response", mlog.Err(err))
c.Logger.Warn("Error while writing response", mlog.Err(err))
}
}

2
server/channels/api4/config.go
View file

@ -428,7 +428,7 @@ func makeFilterConfigByPermission(accessType filterType) func(c *Context, struct
return true
}
} else {
mlog.Warn("Unrecognized config permissions tag value.", mlog.String("tag_value", permissionID))
c.Logger.Warn("Unrecognized config permissions tag value.", mlog.String("tag_value", permissionID))
}
}

2
server/channels/api4/handlers.go
View file

@ -201,7 +201,7 @@ func (api *API) RateLimitedHandler(apiHandler http.Handler, settings model.RateL
rateLimiter, err := app.NewRateLimiter(&settings, []string{})
if err != nil {
mlog.Error("getRateLimitedHandler", mlog.Err(err))
api.srv.Log().Error("getRateLimitedHandler", mlog.Err(err))
return nil
}
return rateLimiter.RateLimitHandler(apiHandler)

2
server/channels/api4/job.go
View file

@ -151,7 +151,7 @@ func getJobs(c *Context, w http.ResponseWriter, r *http.Request) {
for _, jobType := range model.AllJobTypes {
hasPermission, permissionRequired := c.App.SessionHasPermissionToReadJob(*c.AppContext.Session(), jobType)
if permissionRequired == nil {
mlog.Warn("The job types of a job you are trying to retrieve does not contain permissions", mlog.String("jobType", jobType))
c.Logger.Warn("The job types of a job you are trying to retrieve does not contain permissions", mlog.String("jobType", jobType))
continue
}
if hasPermission {

10
server/channels/api4/system.go
View file

@ -172,7 +172,7 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
}
if s[dbStatusKey] == model.StatusOk {
mlog.Debug("Able to write to database.")
c.Logger.Debug("Able to write to database.")
}
filestoreStatusKey := "filestore_status"
@ -853,7 +853,7 @@ func getWarnMetricsStatus(c *Context, w http.ResponseWriter, r *http.Request) {
license := c.App.Channels().License()
if license != nil {
mlog.Debug("License is present, skip.")
c.Logger.Debug("License is present, skip.")
return
}
@ -884,7 +884,7 @@ func sendWarnMetricAckEmail(c *Context, w http.ResponseWriter, r *http.Request)
license := c.App.Channels().License()
if license != nil {
mlog.Debug("License is present, skip.")
c.Logger.Debug("License is present, skip.")
return
}
@ -920,13 +920,13 @@ func requestTrialLicenseAndAckWarnMetric(c *Context, w http.ResponseWriter, r *h
}
if model.BuildEnterpriseReady != "true" {
mlog.Debug("Not Enterprise Edition, skip.")
c.Logger.Debug("Not Enterprise Edition, skip.")
return
}
license := c.App.Channels().License()
if license != nil {
mlog.Debug("License is present, skip.")
c.Logger.Debug("License is present, skip.")
return
}

3
server/channels/api4/system_test.go
View file

@ -23,7 +23,6 @@ import (
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/v8/channels/utils/fileutils"
)
@ -358,7 +357,7 @@ func TestGetLogs(t *testing.T) {
defer th.TearDown()
for i := 0; i < 20; i++ {
mlog.Info(strconv.Itoa(i))
th.TestLogger.Info(strconv.Itoa(i))
}
err := th.TestLogger.Flush()

2
server/channels/api4/websocket.go
View file

@ -55,7 +55,7 @@ func connectWebSocket(c *Context, w http.ResponseWriter, r *http.Request) {
} else {
cfg, err = c.App.Srv().Platform().PopulateWebConnConfig(c.AppContext.Session(), cfg, r.URL.Query().Get(sequenceNumberParam))
if err != nil {
mlog.Warn("Error while populating webconn config", mlog.String("id", r.URL.Query().Get(connectionIDParam)), mlog.Err(err))
c.Logger.Warn("Error while populating webconn config", mlog.String("id", r.URL.Query().Get(connectionIDParam)), mlog.Err(err))
ws.Close()
return
}