feat(pprof): add pprof HTTP server (#807)

- `PPROF_ENABLED=no`
- `PPROF_BLOCK_PROFILE_RATE=0`
- `PPROF_MUTEX_PROFILE_RATE=0`
- `PPROF_HTTP_SERVER_ADDRESS=":6060"`

internal/configuration/settings/helpers/merge.go

@@ -2,6 +2,7 @@ package helpers
 
 import (
 	"net"
+	"net/http"
 	"time"
 
 	"github.com/qdm12/golibs/logging"
@@ -26,6 +27,13 @@ func MergeWithString(existing, other string) (result string) {
 	return other
 }
 
+func MergeWithInt(existing, other int) (result int) {
+	if existing != 0 {
+		return existing
+	}
+	return other
+}
+
 func MergeWithStringPtr(existing, other *string) (result *string) {
 	if existing != nil {
 		return existing
@@ -37,7 +45,7 @@ func MergeWithStringPtr(existing, other *string) (result *string) {
 	return result
 }
 
-func MergeWithInt(existing, other *int) (result *int) {
+func MergeWithIntPtr(existing, other *int) (result *int) {
 	if existing != nil {
 		return existing
 	} else if other == nil {
@@ -99,6 +107,13 @@ func MergeWithLogLevel(existing, other *logging.Level) (result *logging.Level) {
 	return result
 }
 
+func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
+	if existing != nil {
+		return existing
+	}
+	return other
+}
+
 func MergeStringSlices(a, b []string) (result []string) {
 	if a == nil && b == nil {
 		return nil

internal/configuration/settings/helpers/override.go

@@ -2,6 +2,7 @@ package helpers
 
 import (
 	"net"
+	"net/http"
 	"time"
 
 	"github.com/qdm12/golibs/logging"
@@ -24,6 +25,13 @@ func OverrideWithString(existing, other string) (result string) {
 	return other
 }
 
+func OverrideWithInt(existing, other int) (result int) {
+	if other == 0 {
+		return existing
+	}
+	return other
+}
+
 func OverrideWithStringPtr(existing, other *string) (result *string) {
 	if other == nil {
 		return existing
@@ -33,7 +41,7 @@ func OverrideWithStringPtr(existing, other *string) (result *string) {
 	return result
 }
 
-func OverrideWithInt(existing, other *int) (result *int) {
+func OverrideWithIntPtr(existing, other *int) (result *int) {
 	if other == nil {
 		return existing
 	}
@@ -87,6 +95,13 @@ func OverrideWithLogLevel(existing, other *logging.Level) (result *logging.Level
 	return result
 }
 
+func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
+	if other != nil {
+		return other
+	}
+	return existing
+}
+
 func OverrideWithStringSlice(existing, other []string) (result []string) {
 	if other == nil {
 		return existing

internal/configuration/settings/openvpn.go

@@ -199,7 +199,7 @@ func (o *OpenVPN) mergeWith(other OpenVPN) {
 	o.Interface = helpers.MergeWithString(o.Interface, other.Interface)
 	o.Root = helpers.MergeWithBool(o.Root, other.Root)
 	o.ProcUser = helpers.MergeWithString(o.ProcUser, other.ProcUser)
-	o.Verbosity = helpers.MergeWithInt(o.Verbosity, other.Verbosity)
+	o.Verbosity = helpers.MergeWithIntPtr(o.Verbosity, other.Verbosity)
 	o.Flags = helpers.MergeStringSlices(o.Flags, other.Flags)
 }
 
@@ -221,7 +221,7 @@ func (o *OpenVPN) overrideWith(other OpenVPN) {
 	o.Interface = helpers.OverrideWithString(o.Interface, other.Interface)
 	o.Root = helpers.OverrideWithBool(o.Root, other.Root)
 	o.ProcUser = helpers.OverrideWithString(o.ProcUser, other.ProcUser)
-	o.Verbosity = helpers.OverrideWithInt(o.Verbosity, other.Verbosity)
+	o.Verbosity = helpers.OverrideWithIntPtr(o.Verbosity, other.Verbosity)
 	o.Flags = helpers.OverrideWithStringSlice(o.Flags, other.Flags)
 }
 

internal/configuration/settings/settings.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/pprof"
 	"github.com/qdm12/gotree"
 )
 
@@ -20,6 +21,7 @@ type Settings struct {
 	Updater       Updater
 	Version       Version
 	VPN           VPN
+	Pprof         pprof.Settings
 }
 
 // Validate validates all the settings and returns an error
@@ -38,6 +40,7 @@ func (s *Settings) Validate(allServers models.AllServers) (err error) {
 		"system":          s.System.validate,
 		"updater":         s.Updater.Validate,
 		"version":         s.Version.validate,
+		// Pprof validation done in pprof constructor
 		"VPN": func() error {
 			return s.VPN.validate(allServers)
 		},
@@ -67,6 +70,7 @@ func (s *Settings) copy() (copied Settings) {
 		Updater:       s.Updater.copy(),
 		Version:       s.Version.copy(),
 		VPN:           s.VPN.copy(),
+		Pprof:         s.Pprof.Copy(),
 	}
 }
 
@@ -83,6 +87,7 @@ func (s *Settings) MergeWith(other Settings) {
 	s.Updater.mergeWith(other.Updater)
 	s.Version.mergeWith(other.Version)
 	s.VPN.mergeWith(other.VPN)
+	s.Pprof.MergeWith(other.Pprof)
 }
 
 func (s *Settings) OverrideWith(other Settings,
@@ -100,6 +105,7 @@ func (s *Settings) OverrideWith(other Settings,
 	patchedSettings.Updater.overrideWith(other.Updater)
 	patchedSettings.Version.overrideWith(other.Version)
 	patchedSettings.VPN.overrideWith(other.VPN)
+	patchedSettings.Pprof.MergeWith(other.Pprof)
 	err = patchedSettings.Validate(allServers)
 	if err != nil {
 		return err
@@ -121,6 +127,7 @@ func (s *Settings) SetDefaults() {
 	s.Updater.SetDefaults()
 	s.Version.setDefaults()
 	s.VPN.setDefaults()
+	s.Pprof.SetDefaults()
 }
 
 func (s Settings) String() string {
@@ -142,6 +149,7 @@ func (s Settings) toLinesNode() (node *gotree.Node) {
 	node.AppendNode(s.PublicIP.toLinesNode())
 	node.AppendNode(s.Updater.toLinesNode())
 	node.AppendNode(s.Version.toLinesNode())
+	node.AppendNode(s.Pprof.ToLinesNode())
 
 	return node
 }