fixup! Lets example servers gracefully shutdown

grpc-ecosystem · Apr 22, 2018 · d2f6566 · d2f6566
1 parent 46d62a3
commit d2f6566
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
@@ -36,10 +36,12 @@ go_test(
         "//examples/server:go_default_library",
         "//examples/sub:go_default_library",
         "//runtime:go_default_library",
+        "@com_github_golang_glog//:go_default_library",
         "@com_github_golang_protobuf//jsonpb:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@com_github_golang_protobuf//ptypes/empty:go_default_library",
         "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
+        "@org_golang_x_net//context:go_default_library",
     ],
 )
diff --git a/examples/main.go b/examples/main.go
@@ -81,17 +81,6 @@ func preflightHandler(w http.ResponseWriter, r *http.Request) {
 	return
 }
 
-func newGateway(ctx context.Context, opts ...runtime.ServeMuxOption) (http.Handler, error) {
-	switch *network {
-	case "tcp":
-		return gateway.NewTCPGateway(ctx, *endpoint, opts...)
-	case "unix":
-		return gateway.NewUnixGateway(ctx, *endpoint, opts...)
-	default:
-		return nil, fmt.Errorf("unsupported network type %q:", *network)
-	}
-}
-
 // Run starts a HTTP server and blocks forever if successful.
 func Run(ctx context.Context, address string, opts ...runtime.ServeMuxOption) error {
 	ctx, cancel := context.WithCancel(ctx)

diff --git a/examples/main_test.go b/examples/main_test.go
@@ -15,7 +15,7 @@ import (
 func runServers(ctx context.Context) <-chan error {
 	ch := make(chan error, 2)
 	go func() {
-		if err := server.Run(ctx, *network, *endpoint); err != nil {
+		if err := server.Run(ctx); err != nil {
 			ch <- fmt.Errorf("cannot run grpc service: %v", err)
 		}
 	}()

diff --git a/examples/server/BUILD.bazel b/examples/server/BUILD.bazel
@@ -25,5 +25,6 @@ go_library(
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//metadata:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
+        "@org_golang_x_net//context:go_default_library",
     ],
 )
diff --git a/examples/server/main.go b/examples/server/main.go
@@ -17,7 +17,7 @@ func Run(ctx context.Context) error {
 	}
 	defer func() {
 		if err := l.Close(); err != nil {
-			glog.Errorf("Failed to close %s %s: %v", network, address, err)
+			glog.Errorf("Failed to close tcp :9090: %v", err)
 		}
 	}()