Merge pull request #174 from anyproto/go-1679-gateway-close-fix-context

fix gateway chan limiter

Author: requilence

pkg/lib/gateway/gateway.go

@@ -185,10 +185,11 @@ func (g *gateway) stopServer() error {
 
 	if g.isServerStarted {
 		g.isServerStarted = false
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		// don't wait for the server shutdown because we don't care for the requests to interrupt
+		ctx, cancel := context.WithTimeout(context.Background(), time.Duration(0))
 		defer cancel()
-		if err := g.server.Shutdown(ctx); err != nil {
-			return err
+		if err := g.server.Shutdown(ctx); err != nil && !errors.Is(err, context.DeadlineExceeded) {
+			log.Errorf("gateway stop error: %s", err.Error())
 		}
 		if err := g.listener.Close(); err != nil && !errors.Is(err, net.ErrClosed) {
 			return err
@@ -209,10 +210,16 @@ func (g *gateway) readLimitCh() {
 
 // fileHandler gets file meta from the DB, gets the corresponding data from the IPFS and decrypts it
 func (g *gateway) fileHandler(w http.ResponseWriter, r *http.Request) {
-	g.limitCh <- struct{}{}
-	defer g.readLimitCh()
+	select {
+	case g.limitCh <- struct{}{}:
+		defer g.readLimitCh()
+	case <-r.Context().Done():
+		// exit fast in case context is already done(e.g. server stopped or client canceled)
+		return
+	}
 	enableCors(w)
-	ctx, cancel := context.WithTimeout(context.Background(), getFileTimeout)
+
+	ctx, cancel := context.WithTimeout(r.Context(), getFileTimeout)
 	defer cancel()
 	file, reader, err := g.getFile(ctx, r)
 	if err != nil {
@@ -249,11 +256,16 @@ func (g *gateway) getFile(ctx context.Context, r *http.Request) (files.File, io.
 
 // imageHandler gets image meta from the DB, gets the corresponding data from the IPFS and decrypts it
 func (g *gateway) imageHandler(w http.ResponseWriter, r *http.Request) {
-	g.limitCh <- struct{}{}
-	defer g.readLimitCh()
+	select {
+	case g.limitCh <- struct{}{}:
+		defer g.readLimitCh()
+	case <-r.Context().Done():
+		// exit fast in case context is already done(e.g. server stopped or client canceled)
+		return
+	}
 	enableCors(w)
 
-	ctx, cancel := context.WithTimeout(context.Background(), getFileTimeout)
+	ctx, cancel := context.WithTimeout(r.Context(), getFileTimeout)
 	defer cancel()
 
 	file, reader, err := g.getImage(ctx, r)