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

code format

This commit is contained in:
huangdan 2016-12-14 19:11:37 +08:00
parent 4aed3abb5e
commit b9220490bf
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/emqttd_SUITE.erl
View File

@ -53,7 +53,7 @@ groups() ->
[{protocol, [sequence], [{protocol, [sequence],
[mqtt_connect, [mqtt_connect,
mqtt_ssl_oneway, mqtt_ssl_oneway,
mqtt_ssl_mutway]}, mqtt_ssl_twoway]},
{pubsub, [sequence], {pubsub, [sequence],
[subscribe_unsubscribe, [subscribe_unsubscribe,
publish, pubsub, publish, pubsub,
@ -144,7 +144,6 @@ mqtt_ssl_oneway(_) ->
{client_id, <<"ssloneway">>}, ssl]), {client_id, <<"ssloneway">>}, ssl]),
timer:sleep(100), timer:sleep(100),
emqttc:subscribe(SslOneWay, <<"topic">>, qos1), emqttc:subscribe(SslOneWay, <<"topic">>, qos1),
{ok, Pub} = emqttc:start_link([{host, "localhost"}, {ok, Pub} = emqttc:start_link([{host, "localhost"},
{client_id, <<"pub">>}]), {client_id, <<"pub">>}]),
receive {publish, _Topic, RM} -> receive {publish, _Topic, RM} ->
@ -154,14 +153,13 @@ mqtt_ssl_oneway(_) ->
emqttc:disconnect(SslOneWay), emqttc:disconnect(SslOneWay),
emqttc:disconnect(Pub). emqttc:disconnect(Pub).
mqtt_ssl_mutway(Config) -> mqtt_ssl_twoway(Config) ->
emqttd_cluster:prepare(), emqttd_cluster:prepare(),
DataDir = proplists:get_value(data_dir, Config), DataDir = proplists:get_value(data_dir, Config),
EmqConfig = proplists:get_value(config, Config), EmqConfig = proplists:get_value(config, Config),
Vals = change_opts(ssl_mut, DataDir, proplists:get_value(emqttd, EmqConfig)), Vals = change_opts(ssl_mut, DataDir, proplists:get_value(emqttd, EmqConfig)),
[application:set_env(emqttd, Par, Value) || {Par, Value} <- Vals], [application:set_env(emqttd, Par, Value) || {Par, Value} <- Vals],
emqttd_cluster:reboot(), emqttd_cluster:reboot(),
ClientSSl = [{Key, filename:join([DataDir, File])} || ClientSSl = [{Key, filename:join([DataDir, File])} ||
{Key, File} <- ?MQTT_SSL_CLIENT ], {Key, File} <- ?MQTT_SSL_CLIENT ],
{ok, SslMutWay} = emqttc:start_link([{host, "localhost"}, {ok, SslMutWay} = emqttc:start_link([{host, "localhost"},
@ -643,6 +641,7 @@ slave(emqttd, Node) ->
slave(node, Node) -> slave(node, Node) ->
{ok, N} = slave:start(host(), Node, "-pa ../../ebin -pa ../../deps/*/ebin"), {ok, N} = slave:start(host(), Node, "-pa ../../ebin -pa ../../deps/*/ebin"),
N. N.
emqttd_config(DataDir) -> emqttd_config(DataDir) ->
Schema = cuttlefish_schema:files([filename:join([DataDir, "emqttd.schema"])]), Schema = cuttlefish_schema:files([filename:join([DataDir, "emqttd.schema"])]),
Conf = conf_parse:file(filename:join([DataDir, "emqttd.conf"])), Conf = conf_parse:file(filename:join([DataDir, "emqttd.conf"])),
@ -650,7 +649,8 @@ emqttd_config(DataDir) ->
change_opts(SslType, DataDir, Vals) -> change_opts(SslType, DataDir, Vals) ->
Listeners = proplists:get_value(listeners, Vals), Listeners = proplists:get_value(listeners, Vals),
NewListeners = lists:foldl(fun({Protocol, Port, Opts} = Listener, Acc) -> NewListeners =
lists:foldl(fun({Protocol, Port, Opts} = Listener, Acc) ->
case Protocol of case Protocol of
ssl -> ssl ->
SslOpts = proplists:get_value(ssl, Opts), SslOpts = proplists:get_value(ssl, Opts),