mirror of
https://github.com/fluencelabs/tendermint
synced 2025-06-24 18:21:38 +00:00
small fixes to spec & http_server & Vagrantfile (#2859)
* Vagrantfile: install dev_tools Follow-up on https://github.com/tendermint/tendermint/pull/2824 * update consensus params spec * fix test name * rpc_test: panic if failed to start listener also - remove http_server#MustListen - align StartHTTPServer and StartHTTPAndTLSServer functions * dep: allow minor releases for grpc
This commit is contained in:
committed by
Ethan Buchman
parent
d8ab8509de
commit
e6a0d098e8
@ -33,12 +33,12 @@ const (
|
||||
// It wraps handler with RecoverAndLogHandler.
|
||||
// NOTE: This function blocks - you may want to call it in a go-routine.
|
||||
func StartHTTPServer(listener net.Listener, handler http.Handler, logger log.Logger) error {
|
||||
logger.Info(fmt.Sprintf("Starting RPC HTTP server on %s", listener.Addr()))
|
||||
err := http.Serve(
|
||||
listener,
|
||||
RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
|
||||
)
|
||||
logger.Info("RPC HTTP server stopped", "err", err)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
@ -51,24 +51,16 @@ func StartHTTPAndTLSServer(
|
||||
certFile, keyFile string,
|
||||
logger log.Logger,
|
||||
) error {
|
||||
logger.Info(
|
||||
fmt.Sprintf(
|
||||
"Starting RPC HTTPS server on %s (cert: %q, key: %q)",
|
||||
listener.Addr(),
|
||||
certFile,
|
||||
keyFile,
|
||||
),
|
||||
)
|
||||
if err := http.ServeTLS(
|
||||
logger.Info(fmt.Sprintf("Starting RPC HTTPS server on %s (cert: %q, key: %q)",
|
||||
listener.Addr(), certFile, keyFile))
|
||||
err := http.ServeTLS(
|
||||
listener,
|
||||
RecoverAndLogHandler(maxBytesHandler{h: handler, n: maxBodyBytes}, logger),
|
||||
certFile,
|
||||
keyFile,
|
||||
); err != nil {
|
||||
logger.Error("RPC HTTPS server stopped", "err", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
)
|
||||
logger.Info("RPC HTTPS server stopped", "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
func WriteRPCResponseHTTPError(
|
||||
@ -170,16 +162,6 @@ func (h maxBytesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
h.h.ServeHTTP(w, r)
|
||||
}
|
||||
|
||||
// MustListen starts a new net.Listener on the given address.
|
||||
// It panics in case of error.
|
||||
func MustListen(addr string, config Config) net.Listener {
|
||||
l, err := Listen(addr, config)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("Listen() failed: %v", err))
|
||||
}
|
||||
return l
|
||||
}
|
||||
|
||||
// Listen starts a new net.Listener on the given address.
|
||||
// It returns an error if the address is invalid or the call to Listen() fails.
|
||||
func Listen(addr string, config Config) (listener net.Listener, err error) {
|
||||
|
Reference in New Issue
Block a user