From c2c1910671fa56024adf38935b44f278c0197bca Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Tue, 10 Jul 2018 16:38:55 -0500 Subject: [PATCH] fix comment typos --- http/handler.go | 2 +- server.go | 4 ++-- test/pilosa.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http/handler.go b/http/handler.go index c0971b991..d85d3a8a5 100644 --- a/http/handler.go +++ b/http/handler.go @@ -111,7 +111,7 @@ func OptHandlerListener(ln net.Listener) handlerOption { } } -// OptHandlerCloseTimeout controls how long we'll wait for the http Server to +// OptHandlerCloseTimeout controls how long to wait for the http Server to // shutdown cleanly before forcibly destroying it. Default is 30 seconds. func OptHandlerCloseTimeout(d time.Duration) handlerOption { return func(h *Handler) error { diff --git a/server.go b/server.go index 7f106161b..f5e1593ef 100644 --- a/server.go +++ b/server.go @@ -381,14 +381,14 @@ func (s *Server) Close() error { if s.translateFile != nil { errt = s.translateFile.Close() } - // prefer to return handler error over translateFile error over cluster + // prefer to return holder error over translateFile error over cluster // error. This order is somewhat arbitrary. It would be better if we had // some way to combine all the errors, but probably not important enough to // warrant the extra complexity. if errh != nil { return errors.Wrap(errh, "closing handler") } else if errt != nil { - return errors.Wrap(errt, "closing translatFile") + return errors.Wrap(errt, "closing translateFile") } return errors.Wrap(errc, "closing cluster") } diff --git a/test/pilosa.go b/test/pilosa.go index 47db4b37f..001949906 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -57,9 +57,9 @@ func newCommand(opts ...server.CommandOption) *Command { } // set aggressive close timeout by default to avoid hanging tests. This was - // a probably with PDK tests which used go-pilosa as well. We put it at the - // beginning of the option slice so that it can be overridden by an - // user-passed options. + // a problem with PDK tests which used go-pilosa as well. We put it at the + // beginning of the option slice so that it can be overridden by user-passed + // options. opts = append([]server.CommandOption{server.OptCommandCloseTimeout(time.Millisecond * 2)}, opts...) m := &Command{Command: server.NewCommand(os.Stdin, os.Stdout, os.Stderr, opts...), commandOptions: opts} m.Config.DataDir = path