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:15:32 +08:00
parent 4c9e031ece
commit 421ae007e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/emqttd_SUITE.erl
View File

@ -108,11 +108,11 @@ groups() ->
init_per_suite(Config) -> init_per_suite(Config) ->
application:start(lager), application:start(lager),
DataDir = proplists:get_value(data_dir, Config), DataDir = proplists:get_value(data_dir, Config),
NewConfig = emqttd_config(DataDir), NewConfig = emqttd_config(DataDir),
Vals = change_opts(ssl_oneway, DataDir, proplists:get_value(emqttd, NewConfig)), Vals = change_opts(ssl_oneway, DataDir, proplists:get_value(emqttd, NewConfig)),
[application:set_env(emqttd, Par, Value) || {Par, Value} <- Vals], [application:set_env(emqttd, Par, Value) || {Par, Value} <- Vals],
application:ensure_all_started(emqttd), application:ensure_all_started(emqttd),
[{config, NewConfig} | Config]. [{config, NewConfig} | Config].
end_per_suite(_Config) -> end_per_suite(_Config) ->
application:stop(emqttd), application:stop(emqttd),
@ -664,7 +664,7 @@ change_opts(SslType, DataDir, Vals) ->
CAfile = filename:join([DataDir, proplists:get_value(cacertfile, ?MQTT_SSL_MUTWAY)]), CAfile = filename:join([DataDir, proplists:get_value(cacertfile, ?MQTT_SSL_MUTWAY)]),
MutSslList = lists:keyreplace(cacertfile, 1, ?MQTT_SSL_MUTWAY, {cacertfile, CAfile}), MutSslList = lists:keyreplace(cacertfile, 1, ?MQTT_SSL_MUTWAY, {cacertfile, CAfile}),
lists:merge(TupleList2, MutSslList); lists:merge(TupleList2, MutSslList);
_ -> _ ->
TupleList2 TupleList2
end, end,
[{Protocol, Port, [{ssl, TupleList3}]} | Acc]; [{Protocol, Port, [{ssl, TupleList3}]} | Acc];