admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(config): upgrade to gosettings v0.4.0

Browse Source 
- drop qdm12/govalid dependency
- upgrade qdm12/ss-server to v0.6.0
- do not unset sensitive config settings (makes no sense to me)
This commit is contained in:
Quentin McGaw
2024-03-25 19:14:20 +00:00
parent 23b0320cfb
commit ecc80a5a9e
88 changed files with 1371 additions and 2621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/pprof/settings.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/httpserver"
"github.com/qdm12/gosettings"
"github.com/qdm12/gosettings/reader"
"github.com/qdm12/gotree"
)
@@ -28,9 +29,9 @@ type Settings struct {
func (s *Settings) SetDefaults() {
s.Enabled = gosettings.DefaultPointer(s.Enabled, false)
s.HTTPServer.Address = gosettings.DefaultString(s.HTTPServer.Address, "localhost:6060")
s.HTTPServer.Address = gosettings.DefaultComparable(s.HTTPServer.Address, "localhost:6060")
const defaultReadTimeout = 5 * time.Minute // for CPU profiling
s.HTTPServer.ReadTimeout = gosettings.DefaultNumber(s.HTTPServer.ReadTimeout, defaultReadTimeout)
s.HTTPServer.ReadTimeout = gosettings.DefaultComparable(s.HTTPServer.ReadTimeout, defaultReadTimeout)
s.HTTPServer.SetDefaults()
}
@@ -43,13 +44,6 @@ func (s Settings) Copy() (copied Settings) {
}
}
func (s *Settings) MergeWith(other Settings) {
s.Enabled = gosettings.MergeWithPointer(s.Enabled, other.Enabled)
s.BlockProfileRate = gosettings.MergeWithPointer(s.BlockProfileRate, other.BlockProfileRate)
s.MutexProfileRate = gosettings.MergeWithPointer(s.MutexProfileRate, other.MutexProfileRate)
s.HTTPServer.MergeWith(other.HTTPServer)
}
func (s *Settings) OverrideWith(other Settings) {
s.Enabled = gosettings.OverrideWithPointer(s.Enabled, other.Enabled)
s.BlockProfileRate = gosettings.OverrideWithPointer(s.BlockProfileRate, other.BlockProfileRate)
@@ -97,3 +91,24 @@ func (s Settings) ToLinesNode() (node *gotree.Node) {
func (s Settings) String() string {
return s.ToLinesNode().String()
}
func (s *Settings) Read(r *reader.Reader) (err error) {
s.Enabled, err = r.BoolPtr("PPROF_ENABLED")
if err != nil {
return err
}
s.BlockProfileRate, err = r.IntPtr("PPROF_BLOCK_PROFILE_RATE")
if err != nil {
return err
}
s.MutexProfileRate, err = r.IntPtr("PPROF_MUTEX_PROFILE_RATE")
if err != nil {
return err
}
s.HTTPServer.Address = r.String("PPROF_HTTP_SERVER_ADDRESS")
return nil
}