Skip to content

Commit

Permalink
caddy: don't override default values
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Apr 19, 2023
1 parent 313427f commit bc04b25
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions caddy/caddy.go
Expand Up @@ -64,10 +64,10 @@ type Mercure struct {
WriteTimeout *caddy.Duration `json:"write_timeout,omitempty"`

// Maximum dispatch duration of an update.
DispatchTimeout caddy.Duration `json:"dispatch_timeout,omitempty"`
DispatchTimeout *caddy.Duration `json:"dispatch_timeout,omitempty"`

// Frequency of the heartbeat, defaults to 40s.
Heartbeat caddy.Duration `json:"heartbeat,omitempty"`
Heartbeat *caddy.Duration `json:"heartbeat,omitempty"`

// JWT key and signing algorithm to use for publishers.
PublisherJWT JWTConfig `json:"publisher_jwt,omitempty"`
Expand Down Expand Up @@ -196,11 +196,11 @@ func (m *Mercure) Provision(ctx caddy.Context) error { //nolint:funlen
if d := m.WriteTimeout; d != nil {
opts = append(opts, mercure.WithWriteTimeout(time.Duration(*d)))
}
if d := m.DispatchTimeout; d != 0 {
opts = append(opts, mercure.WithDispatchTimeout(time.Duration(d)))
if d := m.DispatchTimeout; d != nil {
opts = append(opts, mercure.WithDispatchTimeout(time.Duration(*d)))
}
if d := m.Heartbeat; d != 0 {
opts = append(opts, mercure.WithHeartbeat(time.Duration(d)))
if d := m.Heartbeat; d != nil {
opts = append(opts, mercure.WithHeartbeat(time.Duration(*d)))
}
if len(m.PublishOrigins) > 0 {
opts = append(opts, mercure.WithPublishOrigins(m.PublishOrigins))
Expand Down Expand Up @@ -278,7 +278,8 @@ func (m *Mercure) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { //nolint:fu
return err //nolint:wrapcheck
}

m.DispatchTimeout = caddy.Duration(d)
cd := caddy.Duration(d)
m.DispatchTimeout = &cd

case "heartbeat":
if !d.NextArg() {
Expand All @@ -290,7 +291,8 @@ func (m *Mercure) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { //nolint:fu
return err //nolint:wrapcheck
}

m.Heartbeat = caddy.Duration(d)
cd := caddy.Duration(d)
m.Heartbeat = &cd

case "publisher_jwt":
if !d.NextArg() {
Expand Down

0 comments on commit bc04b25

Please sign in to comment.