all repos — homestead @ 2ea9b6cc0c1249f062d2d01c46a280c51f6b9769

Code for my website

Use errors.WithMessage in place of .Wrap

Alan Pearce
commit

2ea9b6cc0c1249f062d2d01c46a280c51f6b9769

parent

5c9eb456d14c37acfb1294425f607810ddebb302

1 file changed, 6 insertions(+), 6 deletions(-)

changed files
M internal/server/tls.gointernal/server/tls.go
@@ -73,13 +73,13 @@ } else {
rc := &redisConfig{} _, err = conf.Parse("REDIS", rc) if err != nil { - return errors.Wrap(err, "could not parse redis config") + return errors.WithMessage(err, "could not parse redis config") } pdns := &powerdns.Provider{} _, err = conf.Parse("POWERDNS", pdns) if err != nil { - return errors.Wrap(err, "could not parse PowerDNS ACME config") + return errors.WithMessage(err, "could not parse PowerDNS ACME config") } issuer = certmagic.NewACMEIssuer(cfg, certmagic.ACMEIssuer{
@@ -113,7 +113,7 @@ err = rs.Provision(caddy.Context{
Context: context.Background(), }) if err != nil { - return errors.Wrap(err, "could not provision redis storage") + return errors.WithMessage(err, "could not provision redis storage") } } cfg.Issuers[0] = issuer
@@ -124,7 +124,7 @@ net.JoinHostPort(s.runtimeConfig.ListenAddress, strconv.Itoa(s.runtimeConfig.Port)),
log.Named("listenfd"), ) if err != nil { - return errors.Wrap(err, "could not bind plain socket") + return errors.WithMessage(err, "could not bind plain socket") } go func(ln net.Listener, srv *http.Server) {
@@ -169,7 +169,7 @@ s.runtimeConfig.TLSPort,
) err = cfg.ManageAsync(context.TODO(), certificateDomains) if err != nil { - return errors.Wrap(err, "could not enable TLS") + return errors.WithMessage(err, "could not enable TLS") } tlsConfig := cfg.TLSConfig() tlsConfig.NextProtos = append([]string{"h2", "http/1.1"}, tlsConfig.NextProtos...)
@@ -181,7 +181,7 @@ tlsConfig,
log.Named("listenfd"), ) if err != nil { - return errors.Wrap(err, "could not bind tls socket") + return errors.WithMessage(err, "could not bind tls socket") } return s.Serve(sln)