Limit list_log_file response size #265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bernd
requested changes
Jul 24, 2018
api/graylog.go
Outdated
| @@ -151,7 +152,16 @@ func UpdateRegistration(httpClient *http.Client, ctx *context.Ctx, status *grayl | |||
| registration.NodeDetails.Status = status | |||
| registration.NodeDetails.Metrics = metrics | |||
| if len(ctx.UserConfig.ListLogFiles) > 0 { | |||
| registration.NodeDetails.LogFileList = common.ListFiles(ctx.UserConfig.ListLogFiles) | |||
| fileList := common.ListFiles(ctx.UserConfig.ListLogFiles) | |||
| fileListSize := (int)(unsafe.Sizeof(common.File{})) * len(fileList) | |||
There was a problem hiding this comment.
Is this actually correct? As far as I understand, this measures the size of an empty common.File struct. But a filled struct might be much larger because we don't know the length of the strings beforehand.
How about measuring the serialized request by marshaling it into JSON?
There was a problem hiding this comment.
Was thinking about that too, my concern was that we would do the same operation two times. Marshal to JSON to get the list size... marshal again to actually send the request. It's not too expensive but anyway. Guess the result will be better because we also get the JSON overhead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes Graylog2/graylog2-server#4899