mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-03 21:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remake Prometheus endpoint into a proper endpoint module

Browse source
This commit is contained in:
fox.cpp 2020-08-23 15:41:52 +03:00
parent bb77f8e86d
commit f58da8a5a5
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
6 changed files with 160 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
maddy.go
View file

@ -23,7 +23,6 @@ import (
"flag"
"fmt"
"io"
"net"
"net/http"
"os"
"path/filepath"
@ -37,7 +36,6 @@ import (
"github.com/foxcpp/maddy/framework/hooks"
"github.com/foxcpp/maddy/framework/log"
"github.com/foxcpp/maddy/framework/module"
"github.com/prometheus/client_golang/prometheus/promhttp"
// Import packages for side-effect of module registration.
_ "github.com/foxcpp/maddy/internal/auth/dovecot_sasl"
@ -56,6 +54,7 @@ import (
_ "github.com/foxcpp/maddy/internal/check/spf"
_ "github.com/foxcpp/maddy/internal/endpoint/dovecot_sasld"
_ "github.com/foxcpp/maddy/internal/endpoint/imap"
_ "github.com/foxcpp/maddy/internal/endpoint/openmetrics"
_ "github.com/foxcpp/maddy/internal/endpoint/smtp"
_ "github.com/foxcpp/maddy/internal/imap_filter"
_ "github.com/foxcpp/maddy/internal/imap_filter/command"
@ -116,8 +115,6 @@ var (
profileEndpoint *string
blockProfileRate *int
mutexProfileFract *int
prometheusEndpoint string
)
func BuildInfo() string {
@ -226,25 +223,6 @@ func initDebug() {
}
}
func startPrometheusHTTP(endpoint string) error {
mux := http.NewServeMux()
mux.Handle("/metrics", promhttp.Handler())
l, err := net.Listen("tcp", prometheusEndpoint)
if err != nil {
return err
}
log.Println("listening on", prometheusEndpoint, "for Prometheus scraping")
go func() {
err := http.Serve(l, mux)
if err != nil && err != http.ErrServerClosed {
log.Println("prometheus listener fail:", err)
}
}()
return nil
}
func InitDirs() error {
if config.StateDirectory == "" {
config.StateDirectory = DefaultStateDirectory
@ -304,7 +282,6 @@ func ReadGlobals(cfg []config.Node) (map[string]interface{}, []config.Node, erro
globals := config.NewMap(nil, config.Node{Children: cfg})
globals.String("state_dir", false, false, DefaultStateDirectory, &config.StateDirectory)
globals.String("runtime_dir", false, false, DefaultRuntimeDirectory, &config.RuntimeDirectory)
globals.String("prometheus_endpoint", false, false, "", &prometheusEndpoint)
globals.String("hostname", false, false, "", nil)
globals.String("autogenerated_msg_domain", false, false, "", nil)
globals.Custom("tls", false, false, nil, tls.TLSDirective, nil)
@ -324,13 +301,6 @@ func moduleMain(cfg []config.Node) error {
return err
}
// Set by ReadGlobals.
if prometheusEndpoint != "" {
if err := startPrometheusHTTP(prometheusEndpoint); err != nil {
return err
}
}
if err := InitDirs(); err != nil {
return err
}