Skip to content

feat: check modules in appfiles #10429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkoMin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: check modules in appfiles #10429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions lib/kernel/src/application_controller.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,22 @@ check_conf_data(ConfData) when is_list(ConfData) ->
check_conf_data(_ConfData) ->
{error, "configuration must be a list ended by <dot><whitespace>"}.

check_modules(Modules) when is_list(Modules) ->
check_modules(Modules, sets:new([{version,2}]));
check_modules(Invalid) ->
{error, {invalid_modules, Invalid}}.

check_modules([], _) ->
ok;
check_modules([Module | Rest], Acc) when is_atom(Module) ->
case sets:is_element(Module, Acc) of
true ->
{error, {duplicate_module, Module}};
false ->
check_modules(Rest, sets:add_element(Module, Acc))
end;
check_modules([Invalid | _], _) ->
{error, {invalid_module, Invalid}}.

check_para([], _AppName) ->
ok;
Expand Down Expand Up @@ -1536,6 +1552,10 @@ make_appl_i({application, Name, Opts}) when is_atom(Name), is_list(Opts) ->
Id = get_opt(id, Opts, ""),
Vsn = get_opt(vsn, Opts, ""),
Mods = get_opt(modules, Opts, []),
case check_modules(Mods) of
ok -> ok;
Error -> throw(Error)
end,
Regs = get_opt(registered, Opts, []),
Apps = get_opt(applications, Opts, []),
Mod =
Expand Down
8 changes: 7 additions & 1 deletion lib/kernel/test/application_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@
wait_for_ready_net(),

%% normal exit from the application
ok = rpc:call(Cp1, application, load, [app_trans_normal()]),

Check warning on line 1230 in lib/kernel/test/application_SUITE.erl

View workflow job for this annotation

GitHub Actions / CT Test Results

otp_2718 failed 

artifacts/Unit Test Results/kernel_junit.xml [took 0s]
Raw output 
Test otp_2718 in application_SUITE failed!
{{badmatch,{error,{invalid_module,{transient,1}}}},
 [{application_SUITE,otp_2718,1,[{file,"application_SUITE.erl"},{line,1230}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1796}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1305}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1237}]}]}
?UNTIL(is_loaded(trans_normal, Cp1)),
{error, {{'EXIT',normal},_}} =
rpc:call(Cp1, application, start, [trans_normal, transient]),
Expand Down Expand Up @@ -1397,7 +1397,7 @@
ok = systools:make_script("script_3002", Options),
ok = systools:script2boot("script_3002"),

{error, timeout} = start_node_boot_3002(cp1, "script_3002"),

Check warning on line 1400 in lib/kernel/test/application_SUITE.erl

View workflow job for this annotation

GitHub Actions / CT Test Results

otp_3002 failed 

artifacts/Unit Test Results/kernel_junit.xml [took 0s]
Raw output 
Test otp_3002 in application_SUITE failed!
{{badmatch,{error,{already_running,cp1@a647bdb50664}}},
 [{application_SUITE,otp_3002,1,[{file,"application_SUITE.erl"},{line,1400}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1796}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1305}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1237}]}]}

ok = file:delete("script_3002.boot"),
ok = file:delete("script_3002.rel"),
Expand Down Expand Up @@ -2493,7 +2493,13 @@
{error, {invalid_options,_}} =
application:load({application,name,[{env,[key]}]}),
{error, {invalid_options,_}} =
application:load({application,name,[{env,[{key,value},{key,value}]}]}).
application:load({application,name,[{env,[{key,value},{key,value}]}]}),
{error, {invalid_modules, not_a_list}} =
application:load({application,name,[{modules, not_a_list}]}),
{error, {invalid_module, {mod, 3}}} =
application:load({application,name,[{modules, [mod1, mod2, {mod, 3}]}]}),
{error, {duplicate_module, mod_x}} =
application:load({application,name,[{modules, [mod_a, mod_x, mod_b, mod_x, mod_y]}]}).

%% Test more than one config file defined by one -config parameter:
handle_many_config_files(Conf) when is_list(Conf) ->
Expand Down
Loading