Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-06-11 23:43:29 -07:00
Code Issues Packages Projects Releases 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
parent 9c9b4a5002 3932ca8971
commit 5fd96d2c27
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/chihaya/config.go
+7 -7
View File
@@ -23,13 +23,13 @@ type hookConfig struct {
// ConfigFile represents a namespaced YAML configation file.
type ConfigFile struct {
MainConfigBlock struct {
middleware.Config
PrometheusAddr string `yaml:"prometheus_addr"`
HTTPConfig httpfrontend.Config `yaml:"http"`
UDPConfig udpfrontend.Config `yaml:"udp"`
Storage memory.Config `yaml:"storage"`
PreHooks []hookConfig `yaml:"prehooks"`
PostHooks []hookConfig `yaml:"posthooks"`
middleware.Config `yaml:",inline"`
PrometheusAddr string `yaml:"prometheus_addr"`
HTTPConfig httpfrontend.Config `yaml:"http"`
UDPConfig udpfrontend.Config `yaml:"udp"`
Storage memory.Config `yaml:"storage"`
PreHooks []hookConfig `yaml:"prehooks"`
PostHooks []hookConfig `yaml:"posthooks"`
} `yaml:"chihaya"`
}