LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tus/tusd into v1

This commit is contained in:
Marius 2019-06-16 17:00:10 +02:00
parent 0f70b98b0f a6ebba689f
commit ab641b6f89
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -33,3 +33,5 @@ WORKDIR /srv/tusd-data
EXPOSE 1080 EXPOSE 1080
ENTRYPOINT ["tusd"] ENTRYPOINT ["tusd"]
CMD ["--hooks-dir","/srv/tusd-hooks"] CMD ["--hooks-dir","/srv/tusd-hooks"]
USER tusd

3
cmd/tusd/cli/metrics.go
View File

@ -7,6 +7,7 @@ import (
"github.com/tus/tusd/pkg/prometheuscollector" "github.com/tus/tusd/pkg/prometheuscollector"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
) )
var MetricsOpenConnections = prometheus.NewGauge(prometheus.GaugeOpts{ var MetricsOpenConnections = prometheus.NewGauge(prometheus.GaugeOpts{
@ -28,5 +29,5 @@ func SetupMetrics(handler *handler.Handler) {
prometheus.MustRegister(prometheuscollector.New(handler.Metrics)) prometheus.MustRegister(prometheuscollector.New(handler.Metrics))
stdout.Printf("Using %s as the metrics path.\n", Flags.MetricsPath) stdout.Printf("Using %s as the metrics path.\n", Flags.MetricsPath)
http.Handle(Flags.MetricsPath, prometheus.Handler()) http.Handle(Flags.MetricsPath, promhttp.Handler())
} }