From 1d4243b5654a0c295cc4bf1ac77f0dd3406eac0b Mon Sep 17 00:00:00 2001 From: Matthias Hanel Date: Fri, 16 Jul 2021 16:46:55 -0400 Subject: [PATCH] [fixed] tls timeout now accepts units Signed-off-by: Matthias Hanel --- server/configs/tls.conf | 2 +- server/opts.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/configs/tls.conf b/server/configs/tls.conf index 0982ec08..181bbcd5 100644 --- a/server/configs/tls.conf +++ b/server/configs/tls.conf @@ -5,7 +5,7 @@ listen: 127.0.0.1:4443 tls { cert_file: "./configs/certs/server.pem" key_file: "./configs/certs/key.pem" - timeout: 2 + timeout: "2s" } authorization { diff --git a/server/opts.go b/server/opts.go index 4c4db5d4..471ba675 100644 --- a/server/opts.go +++ b/server/opts.go @@ -3552,6 +3552,14 @@ func parseTLS(v interface{}, isClientCtx bool) (t *TLSConfigOpts, retErr error) at = float64(mv) case float64: at = mv + case string: + d, err := time.ParseDuration(mv) + if err != nil { + return nil, &configErr{tk, fmt.Sprintf("error parsing tls config, 'timeout' %s", err)} + } + at = d.Seconds() + default: + return nil, &configErr{tk, "error parsing tls config, 'timeout' wrong type"} } tc.Timeout = at case "pinned_certs":