nsqd: fix deflate level handling #927
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
|
Can you add the deflate level to the log message "upgrading connection to deflate" below? |
jehiah
force-pushed
the
deflate_level_927
branch
from
50504b7 to
38fdf49
Compare
|
@ploxiln good idea. PTAL |
ploxiln
reviewed
Aug 14, 2017
nsqd/protocol_v2.go
Outdated
| @@ -399,7 +399,7 @@ func (p *protocolV2) IDENTIFY(client *clientV2, params [][]byte) ([]byte, error) | |||
| if identifyData.DeflateLevel <= 0 { | |||
| deflateLevel = 6 | |||
There was a problem hiding this comment.
one more small thing - setting deflateLevel here has no effect, I think we want to set identifyData.DeflateLevel to the default of 6 here
There was a problem hiding this comment.
Instead of that, we should drop the change on line 402 and update line 398 to:
deflateLevel := identifyData.DeflateLevelOtherwise the JSON response below would be broken.
mreiferson
requested changes
Aug 14, 2017
nsqd/protocol_v2.go
Outdated
| @@ -399,7 +399,7 @@ func (p *protocolV2) IDENTIFY(client *clientV2, params [][]byte) ([]byte, error) | |||
| if identifyData.DeflateLevel <= 0 { | |||
| deflateLevel = 6 | |||
There was a problem hiding this comment.
Instead of that, we should drop the change on line 402 and update line 398 to:
deflateLevel := identifyData.DeflateLevelOtherwise the JSON response below would be broken.
|
Want to fix the typo reported in #926 while you're in here??!?!?! |
jehiah
force-pushed
the
deflate_level_927
branch
from
38fdf49 to
7894dc5
Compare
jehiah
force-pushed
the
deflate_level_927
branch
from
7894dc5 to
b4ca0f3
Compare
mreiferson
approved these changes
Aug 26, 2017
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.
This fixes #926 by properly using the client provided deflate level from identify