nsqadmin: format responses #612
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
| router.Handle("POST", "/delete_channel", http_api.Decorate(s.deleteChannelHandler, log, http_api.PlainText)) | ||
| router.Handle("POST", "/pause_channel", http_api.Decorate(s.pauseChannelHandler, log, http_api.PlainText)) | ||
| router.Handle("POST", "/unpause_channel", http_api.Decorate(s.pauseChannelHandler, log, http_api.PlainText)) | ||
| router.Handle("POST", "/create_topic_channel", http_api.Decorate(s.createTopicChannelHandler, log, http_api.PlainText)) |
There was a problem hiding this comment.
maybe it makes sense to use a little function-local helper function at this point, maybe something like
func router_reg(method, path string, handler http.Handler) {
router.Handle(method, path, http_api.Decorate(handler, log), http_api.PlainText)
}
There was a problem hiding this comment.
not a bad idea but also not necessary
|
whoooops, thanks 😁 |
| router.Handle("GET", "/node/:node", http_api.Decorate(s.nodeHandler, log, http_api.PlainText)) | ||
| router.Handle("GET", "/topic/:topic", http_api.Decorate(s.topicHandler, log, http_api.PlainText)) | ||
| router.Handle("GET", "/topic/:topic/:channel", http_api.Decorate(s.channelHandler, log, http_api.PlainText)) | ||
| router.Handle("GET", "/static/*asset", http_api.Decorate(s.embeddedAssetHandler, log, http_api.PlainText)) |
There was a problem hiding this comment.
Meh, I should have dug into this a bit more - only this static route needed the output formatter, all the other template based endpoints write directly to the http.ResponseWriter.
It's fine though, it won't cause any problems and it's all going away in #323
There was a problem hiding this comment.
I think they still needed it for early error returns where the handler didn't write a response?
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 a regresion from #610 where some responses from nsqadmin were not handled properly (notably errors and /static/... assets)
RFR @mreiferson