Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7005 from heyitsanthony/fix-pprof

Browse Source 
embed: deep copy user handlers
This commit is contained in:
Anthony Romano 2016-12-14 12:05:37 -08:00 committed by GitHub
commit a9f72ee0d4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/etcd.go
View File

@ -286,7 +286,9 @@ func startClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
plog.Info("stopping listening for client requests on ", u.Host)
}
}()
sctx.userHandlers = cfg.UserHandlers
for k := range cfg.UserHandlers {
sctx.userHandlers[k] = cfg.UserHandlers[k]
}
if cfg.EnablePprof {
sctx.registerPprof()
}

2
embed/serve.go
View File

@ -51,7 +51,7 @@ type serveCtx struct {
func newServeCtx() *serveCtx {
ctx, cancel := context.WithCancel(context.Background())
return &serveCtx{ctx: ctx, cancel: cancel}
return &serveCtx{ctx: ctx, cancel: cancel, userHandlers: make(map[string]http.Handler)}
}
// serve accepts incoming connections on the listener l,