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

fix(mix): include `node_dump` in tgz and packages

This commit is contained in:
Thales Macedo Garitezi 2022-02-07 16:56:33 -03:00
parent 58b69f97fd
commit eea217093b
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/node_dump
View File

@ -48,7 +48,7 @@ done
# Collect system info: # Collect system info:
{ {
collect "$RUNNER_BIN_DIR"/emqx_ctl broker collect "$RUNNER_BIN_DIR"/emqx_ctl broker
collect "$RUNNER_BIN_DIR"/emqx eval "'emqx_node_dump:sys_info()'" collect "$RUNNER_BIN_DIR"/emqx eval-erl "'emqx_node_dump:sys_info()'"
collect uname -a collect uname -a
collect uptime collect uptime
@ -64,7 +64,7 @@ done
# Collect information about the configuration: # Collect information about the configuration:
{ {
collect "$RUNNER_BIN_DIR"/emqx eval "'emqx_node_dump:app_env_dump()'" collect "$RUNNER_BIN_DIR"/emqx eval-erl "'emqx_node_dump:app_env_dump()'"
} > "${CONF_DUMP}" } > "${CONF_DUMP}"
# Pack files # Pack files

19
mix.exs
View File

@ -417,6 +417,14 @@ defmodule EMQXUmbrella.MixProject do
File.chmod!(Path.join(bin, name), 0o755) File.chmod!(Path.join(bin, name), 0o755)
end end
Mix.Generator.copy_file(
"bin/node_dump",
Path.join(bin, "node_dump"),
force: overwrite?
)
File.chmod!(Path.join(bin, "node_dump"), 0o755)
render_template( render_template(
"rel/BUILT_ON", "rel/BUILT_ON",
assigns, assigns,
@ -505,7 +513,16 @@ defmodule EMQXUmbrella.MixProject do
# add those to the `:overlays` key before running `:tar`. # add those to the `:overlays` key before running `:tar`.
# See: https://hexdocs.pm/mix/1.13.2/Mix.Release.html#__struct__/0 # See: https://hexdocs.pm/mix/1.13.2/Mix.Release.html#__struct__/0
defp prepare_tar_overlays(release) do defp prepare_tar_overlays(release) do
Map.update!(release, :overlays, &["etc", "data" | &1]) Map.update!(
release,
:overlays,
&[
"etc",
"data",
"bin/node_dump"
| &1
]
)
end end
############################################################################# #############################################################################

2
scripts/check-elixir-emqx-machine-boot-discrepancies.exs
View File

@ -30,6 +30,7 @@ defmodule CheckElixirEMQXMachineBootDiscrepancies do
"rebar.config.erl has the following emqx_machine_boot_apps " <> "rebar.config.erl has the following emqx_machine_boot_apps " <>
"that are missing in mix.exs:" "that are missing in mix.exs:"
) )
IO.inspect(mix_missing, syntax_colors: [atom: :red]) IO.inspect(mix_missing, syntax_colors: [atom: :red])
end end
@ -39,6 +40,7 @@ defmodule CheckElixirEMQXMachineBootDiscrepancies do
"mix.exs has the following emqx_machine_boot_apps " <> "mix.exs has the following emqx_machine_boot_apps " <>
"that are missing in rebar3.config.erl:" "that are missing in rebar3.config.erl:"
) )
IO.inspect(rebar_missing, syntax_colors: [atom: :red]) IO.inspect(rebar_missing, syntax_colors: [atom: :red])
end end