check for ctx.Done() when using request limiter (#244)

when using the request limiter, ensure that we don't continue to wait on a context that is done

also need to use the request context

service/bfg/bfg.go

@@ -271,15 +271,20 @@ func (s *Server) handleRequest(parentCtx context.Context, bws *bfgWs, wsid strin
 	log.Tracef("handleRequest: %v", bws.addr)
 	defer log.Tracef("handleRequest exit: %v", bws.addr)
 
-	ctx, cancel := context.WithTimeout(parentCtx,
+	ctx, cancel := context.WithTimeout(bws.requestContext,
 		time.Duration(s.cfg.RequestTimeout)*time.Second)
 	defer cancel()
 
 	select {
 	case <-s.requestLimiter:
 	default:
 		log.Infof("Request limiter hit %v: %v", bws.addr, cmd)
-		<-s.requestLimiter
+		select {
+		case <-s.requestLimiter:
+		case <-ctx.Done():
+			log.Infof("request context done %v: %v", bws.addr, cmd)
+			return
+		}
 	}
 	defer func() { s.requestLimiter <- true }()