yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'acceptor_pool' option to 'acceptors'

This commit is contained in:
Ery Lee 2015-03-13 20:18:01 +08:00
parent 25de5ee94d
commit 98a69089c5
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -78,19 +78,19 @@ cd $INSTALL_DIR/emqtt
{auth, {anonymous, []}}, %internal, anonymous {auth, {anonymous, []}}, %internal, anonymous
{listen, [ {listen, [
{mqtt, 1883, [ {mqtt, 1883, [
{max_clients, 1024}, {acceptors, 4},
{acceptor_pool, 4} {max_clients, 1024}
]}, ]},
{mqtts, 8883, [ {mqtts, 8883, [
{acceptors, 4},
{max_clients, 1024}, {max_clients, 1024},
{acceptor_pool, 4},
%{cacertfile, "etc/ssl/cacert.pem"}, %{cacertfile, "etc/ssl/cacert.pem"},
{ssl, [{certfile, "etc/ssl.crt"}, {ssl, [{certfile, "etc/ssl.crt"},
{keyfile, "etc/ssl.key"}]} {keyfile, "etc/ssl.key"}]}
]}, ]},
{http, 8083, [ {http, 8083, [
{max_clients, 512}, {acceptors, 1},
{acceptor_pool, 1} {max_clients, 512}
]} ]}
]} ]}
]} ]}

2
apps/emqttd/src/emqttd_ctl.erl
View File

@ -95,7 +95,7 @@ broker(["metrics"]) ->
listeners([]) -> listeners([]) ->
lists:foreach(fun({{Protocol, Port}, Pid}) -> lists:foreach(fun({{Protocol, Port}, Pid}) ->
?PRINT("listener ~s:~p~n", [Protocol, Port]), ?PRINT("listener ~s:~p~n", [Protocol, Port]),
?PRINT(" acceptor_pool: ~p~n", [esockd:get_acceptor_pool(Pid)]), ?PRINT(" acceptors: ~p~n", [esockd:get_acceptors(Pid)]),
?PRINT(" max_clients: ~p~n", [esockd:get_max_clients(Pid)]), ?PRINT(" max_clients: ~p~n", [esockd:get_max_clients(Pid)]),
?PRINT(" current_clients: ~p~n", [esockd:get_current_clients(Pid)]) ?PRINT(" current_clients: ~p~n", [esockd:get_current_clients(Pid)])
end, esockd:listeners()). end, esockd:listeners()).

4
apps/emqttd/test/emqttd_opts_tests.erl
View File

@ -43,11 +43,11 @@ merge_test() ->
{backlog, 1024}, {backlog, 1024},
{nodelay, false}, {nodelay, false},
{max_clients, 1024}, {max_clients, 1024},
{acceptor_pool, 4}]), {acceptors, 16}]),
?assertEqual(1024, proplists:get_value(backlog, Opts)), ?assertEqual(1024, proplists:get_value(backlog, Opts)),
?assertEqual(1024, proplists:get_value(max_clients, Opts)), ?assertEqual(1024, proplists:get_value(max_clients, Opts)),
?assertEqual(lists:sort(Opts), [binary, raw, ?assertEqual(lists:sort(Opts), [binary, raw,
{acceptor_pool,4}, {acceptors,4},
{backlog,1024}, {backlog,1024},
{max_clients,1024}, {max_clients,1024},
{nodelay,false}, {nodelay,false},

8
doc/GetStarted.md
View File

@ -99,12 +99,12 @@ cd emqtt && ./bin/emqtt stop
]}, ]},
{listen, [ {listen, [
{mqtt, 1883, [ {mqtt, 1883, [
{max_conns, 1024}, {acceptors, 4},
{acceptor_pool, 4} {max_conns, 1024}
]}, ]},
{http, 8083, [ {http, 8083, [
{max_conns, 512}, {acceptors, 1},
{acceptor_pool, 1} {max_conns, 512}
]} ]}
]} ]}
]} ]}

10
rel/files/app.config
View File

@ -65,21 +65,21 @@
]}, ]},
{listen, [ {listen, [
{mqtt, 1883, [ {mqtt, 1883, [
{backlog, 512}, {backlog, 512},
{max_clients, 1024}, {max_clients, 1024},
{acceptor_pool, 4} {acceptors, 16}
]}, ]},
{mqtts, 8883, [ {mqtts, 8883, [
{backlog, 128}, {backlog, 128},
{acceptors, 4},
{max_clients, 1024}, {max_clients, 1024},
{acceptor_pool, 4},
%{cacertfile, "etc/ssl/cacert.pem"}, %{cacertfile, "etc/ssl/cacert.pem"},
{ssl, [{certfile, "etc/ssl.crt"}, {ssl, [{certfile, "etc/ssl.crt"},
{keyfile, "etc/ssl.key"}]} {keyfile, "etc/ssl.key"}]}
]}, ]},
{http, 8083, [ {http, 8083, [
{acceptors, 4}
{max_clients, 512}, {max_clients, 512},
{acceptor_pool, 1}
]} ]}
]} ]}
]} ]}