Merge pull request #245 from hustcat/upstream

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

View file

@ -23,7 +23,7 @@ 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"`