Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: configurable http server timeouts

goenning097ca277b11a
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index bf54c9b4e..587a7d440 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -6,6 +6,7 @@ import (
"path/filepath"
"runtime"
"strings"
+ "time"
"path"
@@ -35,6 +36,11 @@ type config struct {
Certificate string `env:"SSL_CERT"`
CertificateKey string `env:"SSL_CERT_KEY"`
}
+ HTTP struct {
+ ReadTimeout time.Duration `env:"HTTP_READ_TIMEOUT,default=5s,strict"`
+ WriteTimeout time.Duration `env:"HTTP_WRITE_TIMEOUT,default=10s,strict"`
+ IdleTimeout time.Duration `env:"HTTP_IDLE_TIMEOUT,default=120s,strict"`
+ }
Port string `env:"PORT,default=3000"`
HostMode string `env:"HOST_MODE,default=single"`
HostDomain string `env:"HOST_DOMAIN,required"`
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index 0170d2826..77c565f47 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -116,9 +116,9 @@ func (e *Engine) Start(address string) {
stdLog.SetOutput(ioutil.Discard)
e.webServer = &http.Server{
- ReadTimeout: 5 * time.Second,
- WriteTimeout: 10 * time.Second,
- IdleTimeout: 120 * time.Second,
+ ReadTimeout: env.Config.HTTP.ReadTimeout,
+ WriteTimeout: env.Config.HTTP.WriteTimeout,
+ IdleTimeout: env.Config.HTTP.IdleTimeout,
Addr: address,
Handler: e.mux,
TLSConfig: getDefaultTLSConfig(env.Config.TLS.Automatic),
diff --git a/app/pkg/web/metrics.go b/app/pkg/web/metrics.go
index 28cbd4aa3..2a605bf9e 100644
--- a/app/pkg/web/metrics.go
+++ b/app/pkg/web/metrics.go
@@ -2,8 +2,8 @@ package web
import (
"net/http"
- "time"
+ "github.com/getfider/fider/app/pkg/env"
"github.com/julienschmidt/httprouter"
"github.com/prometheus/client_golang/prometheus/promhttp"
)
@@ -13,9 +13,9 @@ func newMetricsServer(address string) *http.Server {
mux.Handler("GET", "/metrics", promhttp.Handler())
return &http.Server{
- ReadTimeout: 5 * time.Second,
- WriteTimeout: 10 * time.Second,
- IdleTimeout: 120 * time.Second,
+ ReadTimeout: env.Config.HTTP.ReadTimeout,
+ WriteTimeout: env.Config.HTTP.WriteTimeout,
+ IdleTimeout: env.Config.HTTP.IdleTimeout,
Addr: address,
Handler: mux,
}