remove close notifier methods (#478)

improbable-eng · Aug 5, 2019 · d3a3431 · d3a3431
1 parent fdc3ed8
commit d3a3431
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/go/grpcweb/grpc_web_response.go b/go/grpcweb/grpc_web_response.go
@@ -66,10 +66,6 @@ func (w *grpcWebResponse) Flush() {
 	}
 }
 
-func (w *grpcWebResponse) CloseNotify() <-chan bool {
-	return w.wrapped.(http.CloseNotifier).CloseNotify()
-}
-
 // prepareHeaders runs all required header copying and transformations to
 // prepare the header of the wrapped response writer.
 func (w *grpcWebResponse) prepareHeaders() {
@@ -163,7 +159,3 @@ func (w *base64ResponseWriter) Flush() {
 	w.newEncoder()
 	w.wrapped.(http.Flusher).Flush()
 }
-
-func (w *base64ResponseWriter) CloseNotify() <-chan bool {
-	return w.wrapped.(http.CloseNotifier).CloseNotify()
-}
diff --git a/go/grpcweb/websocket_wrapper.go b/go/grpcweb/websocket_wrapper.go
@@ -16,20 +16,18 @@ import (
 )
 
 type webSocketResponseWriter struct {
-	writtenHeaders  bool
-	wsConn          *websocket.Conn
-	headers         http.Header
-	flushedHeaders  http.Header
-	closeNotifyChan chan bool
+	writtenHeaders bool
+	wsConn         *websocket.Conn
+	headers        http.Header
+	flushedHeaders http.Header
 }
 
 func newWebSocketResponseWriter(wsConn *websocket.Conn) *webSocketResponseWriter {
 	return &webSocketResponseWriter{
-		writtenHeaders:  false,
-		headers:         make(http.Header),
-		flushedHeaders:  make(http.Header),
-		wsConn:          wsConn,
-		closeNotifyChan: make(chan bool, 1),
+		writtenHeaders: false,
+		headers:        make(http.Header),
+		flushedHeaders: make(http.Header),
+		wsConn:         wsConn,
 	}
 }
 
@@ -90,10 +88,6 @@ func (w *webSocketResponseWriter) Flush() {
 	// no-op
 }
 
-func (w *webSocketResponseWriter) CloseNotify() <-chan bool {
-	return w.closeNotifyChan
-}
-
 type webSocketWrappedReader struct {
 	wsConn          *websocket.Conn
 	respWriter      *webSocketResponseWriter