Skip to content

Commit

Permalink
Moving the newResponseWriter factory to ChannelTransport and Transport
Browse files Browse the repository at this point in the history
NewResponseWriter was moved to ChannelTransport and Transport  to keep
tchannel handler's constructor parameters consisent with the pattern in
which these parameters come from the fields of ChannelTransport and
ChannelTransport.
  • Loading branch information
r-hang committed Sep 18, 2018
1 parent c56bf86 commit d70430a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 24 deletions.
33 changes: 17 additions & 16 deletions transport/tchannel/channel_transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ func (options transportOptions) newChannelTransport() *ChannelTransport {
logger = zap.NewNop()
}
return &ChannelTransport{
once: lifecycle.NewOnce(),
ch: options.ch,
addr: options.addr,
tracer: options.tracer,
logger: logger.Named("tchannel"),
originalHeaders: options.originalHeaders,
once: lifecycle.NewOnce(),
ch: options.ch,
addr: options.addr,
tracer: options.tracer,
logger: logger.Named("tchannel"),
originalHeaders: options.originalHeaders,
newResponseWriter: newHandlerWriter,
}
}

Expand All @@ -96,15 +97,15 @@ func (options transportOptions) newChannelTransport() *ChannelTransport {
// If you have a YARPC peer.Chooser, use the unqualified tchannel.Transport
// instead.
type ChannelTransport struct {
ch Channel
name string
addr string
tracer opentracing.Tracer
logger *zap.Logger
router transport.Router
originalHeaders bool

once *lifecycle.Once
once *lifecycle.Once
ch Channel
name string
addr string
tracer opentracing.Tracer
logger *zap.Logger
router transport.Router
originalHeaders bool
newResponseWriter func(inboundCallResponse, tchannel.Format, headerCase) responseWriter
}

// Channel returns the underlying TChannel "Channel" instance.
Expand Down Expand Up @@ -139,7 +140,7 @@ func (t *ChannelTransport) start() error {
for s := range services {
sc := t.ch.GetSubChannel(s)
existing := sc.GetHandlers()
sc.SetHandler(handler{existing: existing, router: t.router, tracer: t.tracer, logger: t.logger, newResponseWriter: newHandlerWriter})
sc.SetHandler(handler{existing: existing, router: t.router, tracer: t.tracer, logger: t.logger, newResponseWriter: t.newResponseWriter})
}
}

Expand Down
18 changes: 10 additions & 8 deletions transport/tchannel/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ type Transport struct {
lock sync.Mutex
once *lifecycle.Once

ch *tchannel.Channel
router transport.Router
tracer opentracing.Tracer
logger *zap.Logger
name string
addr string
listener net.Listener
ch *tchannel.Channel
router transport.Router
tracer opentracing.Tracer
logger *zap.Logger
name string
addr string
listener net.Listener
newResponseWriter func(inboundCallResponse, tchannel.Format, headerCase) responseWriter

connTimeout time.Duration
initialConnRetryDelay time.Duration
Expand Down Expand Up @@ -111,6 +112,7 @@ func (o transportOptions) newTransport() *Transport {
tracer: o.tracer,
logger: logger,
headerCase: headerCase,
newResponseWriter: newHandlerWriter,
}
}

Expand Down Expand Up @@ -202,7 +204,7 @@ func (t *Transport) start() error {
tracer: t.tracer,
headerCase: t.headerCase,
logger: t.logger,
newResponseWriter: newHandlerWriter,
newResponseWriter: t.newResponseWriter,
},
OnPeerStatusChanged: t.onPeerStatusChanged,
}
Expand Down

0 comments on commit d70430a

Please sign in to comment.