Skip to content

Expose the HTTP server from the server struct.#118

Merged
bboreham merged 3 commits intoweaveworks:masterfrom
tomwilkie:expose-http-server
Aug 24, 2018
Merged

Expose the HTTP server from the server struct.#118
bboreham merged 3 commits intoweaveworks:masterfrom
tomwilkie:expose-http-server

Conversation

@tomwilkie
Copy link
Contributor

This allows users to inject HTTP requests and have the logged, instrumented and traced correctly.

See cortexproject/cortex#949

Signed-off-by: Tom Wilkie tom.wilkie@gmail.com

This allows users to inject HTTP requests and have the logged, instrumented and traced correctly.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
GRPC *grpc.Server
Log logging.Interface
HTTP *mux.Router
HTTPServer *http.Server

This comment was marked as abuse.

This comment was marked as abuse.

@bboreham
Copy link
Collaborator

note CI tests failed

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
@tomwilkie
Copy link
Contributor Author

I think its flake #120

…eturn an error before Run starts listening on errChan.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
@bboreham bboreham merged commit 1a7a6b3 into weaveworks:master Aug 24, 2018
@tomwilkie tomwilkie deleted the expose-http-server branch August 24, 2018 13:58
@tomwilkie
Copy link
Contributor Author

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants