diff options
| author | GitHubPang <61439577+GitHubPang@users.noreply.github.com> | 2020-07-30 17:16:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 17:16:06 +0800 |
| commit | e47c8ed51b1ba925ebabbff86695f09df6c156d0 (patch) | |
| tree | 2759f4f388f6ebe49c25160f575a812ac1573847 /apps | |
| parent | 1dc4e9bdb7c01d986f1d39bf50ce2f301c54525a (diff) | |
| parent | 4d6737e4501cb7a563f4ee4e090e1df580ec101d (diff) | |
| download | rabbitmq-server-git-e47c8ed51b1ba925ebabbff86695f09df6c156d0.tar.gz | |
Merge pull request #1 from rabbitmq/master
Merge from source
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl | 7 | ||||
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl index af7158830a..4e19547229 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -284,7 +284,7 @@ list_schemas_in_app(App) -> {Loaded, Unload} = case application:load(App) of ok -> {true, true}; {error, {already_loaded, _}} -> {true, false}; - {error, _} -> {false, false} + {error, Reason} -> {Reason, false} end, List = case Loaded of true -> @@ -297,9 +297,10 @@ list_schemas_in_app(App) -> SchemaDir = filename:join([PrivDir, "schema"]), do_list_schemas_in_app(App, SchemaDir) end; - false -> + Reason1 -> rabbit_log_prelaunch:debug( - " [ ] ~s (failed to load application)", [App]), + " [ ] ~s (failed to load application: ~p)", + [App, Reason1]), [] end, case Unload of diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl index 4c2b4d887e..b2cc03d069 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl @@ -30,11 +30,13 @@ format_error({error, {invalid_dist_port_range, DistTcpPort}}) -> "Invalid Erlang distribution TCP port: ~b", [DistTcpPort]); format_error({error, {dist_port_already_used, Port, not_erlang, Host}}) -> rabbit_misc:format( - "ERROR: could not bind to distribution port ~b on host ~s. It could be in use " - "by another process or cannot be bound to (e.g. due to a security policy)", [Port, Host]); + "ERROR: could not bind to distribution port ~b on host ~s. It could " + "be in use by another process or cannot be bound to (e.g. due to a " + "security policy)", [Port, Host]); format_error({error, {dist_port_already_used, Port, Name, Host}}) -> rabbit_misc:format( - "ERROR: could not bind to distribution port ~b, it is in use by another node: ~s@~s", [Port, Name, Host]); + "ERROR: could not bind to distribution port ~b, it is in use by " + "another node: ~s@~s", [Port, Name, Host]); format_error({error, {erlang_dist_running_with_unexpected_nodename, Unexpected, Node}}) -> rabbit_misc:format( |