LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #245 from hustcat/upstream

Browse source 
config: fix parsing of embedded struct
This commit is contained in:
mrd0ll4r 2016-10-12 13:50:22 +02:00 committed by GitHub
commit 5fd96d2c27
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/chihaya/config.go
View file

@ -23,13 +23,13 @@ type hookConfig struct {
// ConfigFile represents a namespaced YAML configation file. // ConfigFile represents a namespaced YAML configation file.
type ConfigFile struct { type ConfigFile struct {
MainConfigBlock struct { MainConfigBlock struct {
middleware.Config middleware.Config `yaml:",inline"`
PrometheusAddr string `yaml:"prometheus_addr"` PrometheusAddr string `yaml:"prometheus_addr"`
HTTPConfig httpfrontend.Config `yaml:"http"` HTTPConfig httpfrontend.Config `yaml:"http"`
UDPConfig udpfrontend.Config `yaml:"udp"` UDPConfig udpfrontend.Config `yaml:"udp"`
Storage memory.Config `yaml:"storage"` Storage memory.Config `yaml:"storage"`
PreHooks []hookConfig `yaml:"prehooks"` PreHooks []hookConfig `yaml:"prehooks"`
PostHooks []hookConfig `yaml:"posthooks"` PostHooks []hookConfig `yaml:"posthooks"`
} `yaml:"chihaya"` } `yaml:"chihaya"`
} }