Skip to content

Commit ddcd663

Browse files
committed
BUG/MAJOR: configuration: fix setting of duration types in the config
1 parent 3c14451 commit ddcd663

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

dataplaneapi_configuration.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ func SyncWithFileSettings(server *Server, cfg *configuration.Configuration) { //
3939
server.EnabledListeners = *configStorage.Dataplaneapi.EnabledListeners
4040
}
4141
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.CleanupTimeout != nil && !misc.HasOSArg("", "cleanup-timeout", "") {
42-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.CleanupTimeout); err != nil {
42+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.CleanupTimeout); err == nil {
4343
server.CleanupTimeout = d
4444
}
4545
}
4646
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.GracefulTimeout != nil && !misc.HasOSArg("", "graceful-timeout", "") {
47-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.GracefulTimeout); err != nil {
47+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.GracefulTimeout); err == nil {
4848
server.GracefulTimeout = d
4949
}
5050
}
@@ -67,17 +67,17 @@ func SyncWithFileSettings(server *Server, cfg *configuration.Configuration) { //
6767
server.ListenLimit = *configStorage.Dataplaneapi.ListenLimit
6868
}
6969
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.KeepAlive != nil && !misc.HasOSArg("", "keep-alive", "") {
70-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.KeepAlive); err != nil {
70+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.KeepAlive); err == nil {
7171
server.KeepAlive = d
7272
}
7373
}
7474
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.ReadTimeout != nil && !misc.HasOSArg("", "read-timeout", "") {
75-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.ReadTimeout); err != nil {
75+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.ReadTimeout); err == nil {
7676
server.ReadTimeout = d
7777
}
7878
}
7979
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.WriteTimeout != nil && !misc.HasOSArg("", "write-timeout", "") {
80-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.WriteTimeout); err != nil {
80+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.WriteTimeout); err == nil {
8181
server.WriteTimeout = d
8282
}
8383
}
@@ -100,17 +100,17 @@ func SyncWithFileSettings(server *Server, cfg *configuration.Configuration) { //
100100
server.TLSListenLimit = *configStorage.Dataplaneapi.TLS.TLSListenLimit
101101
}
102102
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.TLS != nil && configStorage.Dataplaneapi.TLS.TLSKeepAlive != nil && !misc.HasOSArg("", "tls-keep-alive", "") {
103-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSKeepAlive); err != nil {
103+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSKeepAlive); err == nil {
104104
server.TLSKeepAlive = d
105105
}
106106
}
107107
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.TLS != nil && configStorage.Dataplaneapi.TLS.TLSReadTimeout != nil && !misc.HasOSArg("", "tls-read-timeout", "") {
108-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSReadTimeout); err != nil {
108+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSReadTimeout); err == nil {
109109
server.TLSReadTimeout = d
110110
}
111111
}
112112
if configStorage.Dataplaneapi != nil && configStorage.Dataplaneapi.TLS != nil && configStorage.Dataplaneapi.TLS.TLSWriteTimeout != nil && !misc.HasOSArg("", "tls-write-timeout", "") {
113-
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSWriteTimeout); err != nil {
113+
if d, err := time.ParseDuration(*configStorage.Dataplaneapi.TLS.TLSWriteTimeout); err == nil {
114114
server.TLSWriteTimeout = d
115115
}
116116
}

0 commit comments

Comments
 (0)