diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-09-29 21:50:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-29 21:50:43 +0100 |
| commit | 1d999712e6902414bbac30db8a5603758c5c539c (patch) | |
| tree | 6d4da7aaa8c1e7fc94c5723703f13e5b6d062dfc /internal/config/state.go | |
| parent | [chore] Add ipv6 localhost to trusted proxies by default (#868) (diff) | |
| download | gotosocial-1d999712e6902414bbac30db8a5603758c5c539c.tar.xz | |
[feature] update config types to use bytesize.Size (#828)
* update config size types to use bytesize.Size
* submit unchecked-out file ... :facepalm:
* fix bytesize config var decoding
* bump bytesize version
* update kim's libraries in readme
* update envparse.sh to output more useful errors
* improve envparse.sh
* remove reliance on jq
* instead, use uint64 for bytesize flag types
* remove redundant type
* fix viper unmarshaling
* Update envparsing.sh
* fix envparsing test
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/config/state.go')
| -rw-r--r-- | internal/config/state.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/internal/config/state.go b/internal/config/state.go index 1364fb84e..17fd31e2a 100644 --- a/internal/config/state.go +++ b/internal/config/state.go @@ -133,6 +133,12 @@ func (st *ConfigState) reloadFromViper() { if err := st.viper.Unmarshal(&st.config, func(c *mapstructure.DecoderConfig) { c.TagName = "name" c.ZeroFields = true // empty the config struct before we marshal values into it + + oldhook := c.DecodeHook + c.DecodeHook = mapstructure.ComposeDecodeHookFunc( + mapstructure.TextUnmarshallerHookFunc(), + oldhook, + ) }); err != nil { panic(err) } |