[MM-60687] Log DoActionRequest requests to INFO (#29952)
* log DoActionRequest requests to INFO * make generated
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
a08341d398
Коммит
c205398040
@@ -135,6 +135,10 @@ type AppIface interface {
|
|||||||
// DisablePlugin will set the config for an installed plugin to disabled, triggering deactivation if active.
|
// DisablePlugin will set the config for an installed plugin to disabled, triggering deactivation if active.
|
||||||
// Notifies cluster peers through config change.
|
// Notifies cluster peers through config change.
|
||||||
DisablePlugin(id string) *model.AppError
|
DisablePlugin(id string) *model.AppError
|
||||||
|
// DoActionRequest performs an HTTP POST request to an integration's action endpoint.
|
||||||
|
// Caller must consume and close returned http.Response as necessary.
|
||||||
|
// For internal requests, requests are routed directly to a plugin ServerHTTP hook
|
||||||
|
DoActionRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError)
|
||||||
// DoPermissionsMigrations execute all the permissions migrations need by the current version.
|
// DoPermissionsMigrations execute all the permissions migrations need by the current version.
|
||||||
DoPermissionsMigrations() error
|
DoPermissionsMigrations() error
|
||||||
// EnablePlugin will set the config for an installed plugin to enabled, triggering asynchronous
|
// EnablePlugin will set the config for an installed plugin to enabled, triggering asynchronous
|
||||||
@@ -290,10 +294,6 @@ type AppIface interface {
|
|||||||
PatchBot(rctx request.CTX, botUserId string, botPatch *model.BotPatch) (*model.Bot, *model.AppError)
|
PatchBot(rctx request.CTX, botUserId string, botPatch *model.BotPatch) (*model.Bot, *model.AppError)
|
||||||
// PatchChannelModerationsForChannel Updates a channels scheme roles based on a given ChannelModerationPatch, if the permissions match the higher scoped role the scheme is deleted.
|
// PatchChannelModerationsForChannel Updates a channels scheme roles based on a given ChannelModerationPatch, if the permissions match the higher scoped role the scheme is deleted.
|
||||||
PatchChannelModerationsForChannel(c request.CTX, channel *model.Channel, channelModerationsPatch []*model.ChannelModerationPatch) ([]*model.ChannelModeration, *model.AppError)
|
PatchChannelModerationsForChannel(c request.CTX, channel *model.Channel, channelModerationsPatch []*model.ChannelModerationPatch) ([]*model.ChannelModeration, *model.AppError)
|
||||||
// Perform an HTTP POST request to an integration's action endpoint.
|
|
||||||
// Caller must consume and close returned http.Response as necessary.
|
|
||||||
// For internal requests, requests are routed directly to a plugin ServerHTTP hook
|
|
||||||
DoActionRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError)
|
|
||||||
// PermanentDeleteBot permanently deletes a bot and its corresponding user.
|
// PermanentDeleteBot permanently deletes a bot and its corresponding user.
|
||||||
PermanentDeleteBot(rctx request.CTX, botUserId string) *model.AppError
|
PermanentDeleteBot(rctx request.CTX, botUserId string) *model.AppError
|
||||||
// PopulateWebConnConfig checks if the connection id already exists in the hub,
|
// PopulateWebConnConfig checks if the connection id already exists in the hub,
|
||||||
|
|||||||
@@ -234,6 +234,15 @@ func (a *App) DoPostActionWithCookie(c request.CTX, postID, actionId, userID, se
|
|||||||
return "", model.NewAppError("DoPostActionWithCookie", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
return "", model.NewAppError("DoPostActionWithCookie", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Log request, regardless of whether destination is internal or external
|
||||||
|
c.Logger().Info("DoPostActionWithCookie POST request, through DoActionRequest",
|
||||||
|
mlog.String("url", upstreamURL),
|
||||||
|
mlog.String("user_id", upstreamRequest.UserId),
|
||||||
|
mlog.String("post_id", upstreamRequest.PostId),
|
||||||
|
mlog.String("channel_id", upstreamRequest.ChannelId),
|
||||||
|
mlog.String("team_id", upstreamRequest.TeamId),
|
||||||
|
)
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(*a.Config().ServiceSettings.OutgoingIntegrationRequestsTimeout)*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(*a.Config().ServiceSettings.OutgoingIntegrationRequestsTimeout)*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
resp, appErr := a.DoActionRequest(c.WithContext(ctx), upstreamURL, requestJSON)
|
resp, appErr := a.DoActionRequest(c.WithContext(ctx), upstreamURL, requestJSON)
|
||||||
@@ -297,7 +306,7 @@ func (a *App) DoPostActionWithCookie(c request.CTX, postID, actionId, userID, se
|
|||||||
return clientTriggerId, nil
|
return clientTriggerId, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Perform an HTTP POST request to an integration's action endpoint.
|
// DoActionRequest performs an HTTP POST request to an integration's action endpoint.
|
||||||
// Caller must consume and close returned http.Response as necessary.
|
// Caller must consume and close returned http.Response as necessary.
|
||||||
// For internal requests, requests are routed directly to a plugin ServerHTTP hook
|
// For internal requests, requests are routed directly to a plugin ServerHTTP hook
|
||||||
func (a *App) DoActionRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError) {
|
func (a *App) DoActionRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError) {
|
||||||
@@ -489,6 +498,14 @@ func (a *App) SubmitInteractiveDialog(c request.CTX, request model.SubmitDialogR
|
|||||||
return nil, model.NewAppError("SubmitInteractiveDialog", "app.submit_interactive_dialog.json_error", nil, "", http.StatusBadRequest).Wrap(err)
|
return nil, model.NewAppError("SubmitInteractiveDialog", "app.submit_interactive_dialog.json_error", nil, "", http.StatusBadRequest).Wrap(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Log request, regardless of whether destination is internal or external
|
||||||
|
c.Logger().Info("SubmitInteractiveDialog POST request, through DoActionRequest",
|
||||||
|
mlog.String("url", url),
|
||||||
|
mlog.String("user_id", request.UserId),
|
||||||
|
mlog.String("channel_id", request.ChannelId),
|
||||||
|
mlog.String("team_id", request.TeamId),
|
||||||
|
)
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(*a.Config().ServiceSettings.OutgoingIntegrationRequestsTimeout)*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(*a.Config().ServiceSettings.OutgoingIntegrationRequestsTimeout)*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
resp, appErr := a.DoActionRequest(c.WithContext(ctx), url, b)
|
resp, appErr := a.DoActionRequest(c.WithContext(ctx), url, b)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user