docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix debug after switch to libchan 

Signed-off-by: Solomon Hykes <solomon@docker.com>
This commit is contained in:
Solomon Hykes 2014-06-18 23:50:26 -07:00 committed by Aaron Feng
parent 7601d49283
commit 0949d4cf73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debug/debug.go
View File

@ -77,7 +77,7 @@ func (dbg *debug) catchall(msg *beam.Message) (err error) {
Args: msg.Args, Args: msg.Args,
Att: msg.Att, Att: msg.Att,
Ret: &replyHandler{ Ret: &replyHandler{
out: msg.Ret, Sender: msg.Ret,
}, },
} }
@ -93,16 +93,16 @@ func (dbg *debug) catchall(msg *beam.Message) (err error) {
// We use a replyHandler to provide context for relaying the return channel // We use a replyHandler to provide context for relaying the return channel
// of the origin message. // of the origin message.
type replyHandler struct { type replyHandler struct {
out beam.Sender beam.Sender
} }
// Send a message using the out channel // Send a message using the out channel
func (rh *replyHandler) Send(msg *beam.Message) (receiver beam.Receiver, err error) { func (rh *replyHandler) Send(msg *beam.Message) (receiver beam.Receiver, err error) {
log.Printf("[debug] <--- Downstream Message { Verb: %s, Args: %v }\n", msg.Verb, msg.Args) log.Printf("[debug] <--- Downstream Message { Verb: %s, Args: %v }\n", msg.Verb, msg.Args)
return nil, forward(rh.out, msg) return nil, forward(rh.Sender, msg)
} }
func (rh *replyHandler) Close() (err error) { func (rh *replyHandler) Close() (err error) {
// Since we don't allow the downstream handler to close the return channel, we do so here. // Since we don't allow the downstream handler to close the return channel, we do so here.
return rh.out.Close() return rh.Sender.Close()
} }