Merge pull request #3076 from rabbitmq/web-mqtt-fd-limit

michaelklishin · web-flow · commit 2be1f16c613c · 2021-06-02T12:39:20.000+03:00
Make Web-MQTT obtain/release a FD via file_handle_cache
diff --git a/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl b/deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl
@@ -79,6 +79,7 @@ init(Req, Opts) ->
                       }, WsOpts}.
 
 websocket_init(State0 = #state{socket = Sock, peername = PeerAddr}) ->
+    ok = file_handle_cache:obtain(),
     case rabbit_net:connection_string(Sock, inbound) of
         {ok, ConnStr} ->
             State = State0#state{
@@ -236,6 +237,7 @@ stop(State) ->
     stop(State, 1000, "MQTT died").
 
 stop(State, CloseCode, Error0) ->
+    ok = file_handle_cache:release(),
     stop_rabbit_mqtt_processor(State),
     Error1 = rabbit_data_coercion:to_binary(Error0),
     {[{close, CloseCode, Error1}], State}.
diff --git a/deps/rabbitmq_web_mqtt_examples/priv/echo.html b/deps/rabbitmq_web_mqtt_examples/priv/echo.html
@@ -45,7 +45,7 @@
   <link href="main.css" rel="stylesheet" type="text/css"/>
   </head>
   <body lang="en">
-    <h1>RabbitMQ Web MQTT Example</h1>
+    <h1><a href="index.html">RabbitMQ Web MQTT Examples</a> > Echo Server</h1>
 
     <div id="first" class="box">
       <h2>Received</h2>
