github/ttrpc
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27 from containerd/ctx

Browse Source 
Add context to Serve
This commit is contained in:
Michael Crosby
2018-07-02 15:18:17 -04:00
committed by GitHub
parent fa6c681436 01ed7d8777
commit 94dde38880
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server.go
View File

@@ -67,12 +67,11 @@ func (s *Server) Register(name string, methods map[string]Method) {
s.services.register(name, methods)
}
func (s *Server) Serve(l net.Listener) error {
func (s *Server) Serve(ctx context.Context, l net.Listener) error {
s.addListener(l)
defer s.closeListener(l)
var (
ctx = context.Background()
backoff time.Duration
handshaker = s.config.handshaker
)

22
server_test.go
View File

@@ -107,7 +107,7 @@ func TestServer(t *testing.T) {
registerTestingService(server, testImpl)
go server.Serve(listener)
go server.Serve(ctx, listener)
defer server.Shutdown(ctx)
const calls = 2
@@ -134,7 +134,7 @@ func TestServerNotFound(t *testing.T) {
defer cleanup()
defer listener.Close()
go func() {
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
var tp testPayload
@@ -156,13 +156,14 @@ func TestServerNotFound(t *testing.T) {
func TestServerListenerClosed(t *testing.T) {
var (
ctx = context.Background()
server = mustServer(t)(NewServer())
_, listener = newTestListener(t)
errs = make(chan error, 1)
)
go func() {
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
if err := listener.Close(); err != nil {
@@ -211,7 +212,7 @@ func TestServerShutdown(t *testing.T) {
})
go func() {
serveErrs <- server.Serve(listener)
serveErrs <- server.Serve(ctx, listener)
}()
// send a series of requests that will get blocked
@@ -254,6 +255,7 @@ func TestServerShutdown(t *testing.T) {
func TestServerClose(t *testing.T) {
var (
ctx = context.Background()
server = mustServer(t)(NewServer())
_, listener = newTestListener(t)
startClose = make(chan struct{})
@@ -262,7 +264,7 @@ func TestServerClose(t *testing.T) {
go func() {
close(startClose)
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
<-startClose
@@ -289,7 +291,7 @@ func TestOversizeCall(t *testing.T) {
defer cleanup()
defer listener.Close()
go func() {
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
registerTestingService(server, &testingServer{})
@@ -324,7 +326,7 @@ func TestClientEOF(t *testing.T) {
defer cleanup()
defer listener.Close()
go func() {
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
registerTestingService(server, &testingServer{})
@@ -362,7 +364,7 @@ func TestUnixSocketHandshake(t *testing.T) {
defer cleanup()
defer listener.Close()
go func() {
errs <- server.Serve(listener)
errs <- server.Serve(ctx, listener)
}()
registerTestingService(server, &testingServer{})
@@ -389,7 +391,7 @@ func BenchmarkRoundTrip(b *testing.B) {
registerTestingService(server, testImpl)
go server.Serve(listener)
go server.Serve(ctx, listener)
defer server.Shutdown(ctx)
var tp testPayload
@@ -421,7 +423,7 @@ func BenchmarkRoundTripUnixSocketCreds(b *testing.B) {
registerTestingService(server, testImpl)
go server.Serve(listener)
go server.Serve(ctx, listener)
defer server.Shutdown(ctx)
var tp testPayload