Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v0.14.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
dchoi-viant committed Nov 11, 2024
2 parents 4e70a88 + f4499fb commit 2af7663
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion service/endpoint/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func RunAppWithConfigError(version string, args []string, cp configProvider) err
}

// RunAppWithConfigWaitError is the full options versions.
/// version is printed if provided in the options.
// version is printed if provided in the options.
// TODO auto-determine version.
// cp is a function that can provide a configuration file.
// wg.Done() will be called once, when the server is finished booting up.
Expand Down
2 changes: 1 addition & 1 deletion service/endpoint/options.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package endpoint

//Options represents an option
// Options represents an option
type Options struct {
ConfigURL string `short:"c" long:"cfg" description:"config URI"`
Version bool `short:"v" long:"version" description:"indexer version"`
Expand Down
2 changes: 1 addition & 1 deletion service/endpoint/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (s *Service) Serve(l net.Listener) error {
tls := s.config.TLS

var err error
if tls == nil {
if tls != nil {
err = tls.Valid()
if err != nil {
return err
Expand Down

0 comments on commit 2af7663

Please sign in to comment.