Merge pull request #323 from cedricgc/hook-logging
cmd/chihaya: log hook names on startup
This commit is contained in:
commit
ceacd6bdbd
2 changed files with 16 additions and 4 deletions
|
@ -21,6 +21,18 @@ type hookConfig struct {
|
|||
Config interface{} `yaml:"config"`
|
||||
}
|
||||
|
||||
type hookConfigs []hookConfig
|
||||
|
||||
// Names returns all hook names listed in the configuration.
|
||||
func (hookCfgs hookConfigs) Names() (hookNames []string) {
|
||||
hookNames = make([]string, len(hookCfgs))
|
||||
for index, hookCfg := range hookCfgs {
|
||||
hookNames[index] = hookCfg.Name
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// Config represents the configuration used for executing Chihaya.
|
||||
type Config struct {
|
||||
middleware.Config `yaml:",inline"`
|
||||
|
@ -28,8 +40,8 @@ type Config struct {
|
|||
HTTPConfig httpfrontend.Config `yaml:"http"`
|
||||
UDPConfig udpfrontend.Config `yaml:"udp"`
|
||||
Storage memory.Config `yaml:"storage"`
|
||||
PreHooks []hookConfig `yaml:"prehooks"`
|
||||
PostHooks []hookConfig `yaml:"posthooks"`
|
||||
PreHooks hookConfigs `yaml:"prehooks"`
|
||||
PostHooks hookConfigs `yaml:"posthooks"`
|
||||
}
|
||||
|
||||
// CreateHooks creates instances of Hooks for all of the PreHooks and PostHooks
|
||||
|
|
|
@ -66,8 +66,8 @@ func (r *Run) Start(ps storage.PeerStore) error {
|
|||
return errors.New("failed to validate hook config: " + err.Error())
|
||||
}
|
||||
log.WithFields(log.Fields{
|
||||
"preHooks": preHooks,
|
||||
"postHooks": postHooks,
|
||||
"preHooks": cfg.PreHooks.Names(),
|
||||
"postHooks": cfg.PostHooks.Names(),
|
||||
}).Info("starting middleware")
|
||||
r.logic = middleware.NewLogic(cfg.Config, r.peerStore, preHooks, postHooks)
|
||||
|
||||
|
|
Loading…
Reference in a new issue