25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

* src/ejabberd_ctl.erl: If ejabberd didn't start correctly:

'ejabberdctl status' suggests to look in log files; any other
ejabberdctl command shows 'status'.

SVN Revision: 1668
This commit is contained in:
Badlop 2008-10-24 22:11:42 +00:00
parent 9e55a1291a
commit 9d521c9dd0
2 changed files with 15 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2008-10-25 Badlop <badlop@process-one.net> 2008-10-25 Badlop <badlop@process-one.net>
* src/ejabberd_ctl.erl: If ejabberd didn't start correctly:
'ejabberdctl status' suggests to look in log files; any other
ejabberdctl command shows 'status'.
* src/ejabberd_app.erl: Open ejabberd.log sooner, so errors during * src/ejabberd_app.erl: Open ejabberd.log sooner, so errors during
ejabberd initialization are logged in that file (EJAB-777). Write ejabberd initialization are logged in that file (EJAB-777). Write
a log message when ejabberd finishes the start or stop. a log message when ejabberd finishes the start or stop.
@ -11,7 +15,7 @@
* src/mod_roster_odbc.erl: Likewise * src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise * src/mod_shared_roster.erl: Likewise
* src/ejabberd_lstener.erl: Fix listeners * src/ejabberd_listener.erl: Fix listeners
* src/ejabberd_sup.erl: Likewise * src/ejabberd_sup.erl: Likewise
* src/gen_mod.erl: Likewise * src/gen_mod.erl: Likewise

View File

@ -132,7 +132,10 @@ process(["status"]) ->
[node(), InternalStatus, ProvidedStatus]), [node(), InternalStatus, ProvidedStatus]),
case lists:keysearch(ejabberd, 1, application:which_applications()) of case lists:keysearch(ejabberd, 1, application:which_applications()) of
false -> false ->
?PRINT("ejabberd is not running in that node~n", []), EjabberdLogPath = ejabberd_app:get_log_path(),
?PRINT("ejabberd is not running in that node~n"
"Check for error messages: ~s~n"
"or other files in that directory.~n", [EjabberdLogPath]),
?STATUS_ERROR; ?STATUS_ERROR;
{value, {_, _, Version}} -> {value, {_, _, Version}} ->
?PRINT("ejabberd ~s is running in that node~n", [Version]), ?PRINT("ejabberd ~s is running in that node~n", [Version]),
@ -237,7 +240,12 @@ try_run_ctp(Args) ->
catch catch
exit:Why -> exit:Why ->
print_usage(), print_usage(),
{io_lib:format("Error in ejabberd ctl process: ~p", [Why]), ?STATUS_USAGE} {io_lib:format("Error in ejabberd ctl process: ~p", [Why]), ?STATUS_USAGE};
Error:Why ->
%% In this case probably ejabberd is not started, so let's show Status
process(["status"]),
?PRINT("~n", []),
{io_lib:format("Error in ejabberd ctl process: '~p' ~p", [Error, Why]), ?STATUS_USAGE}
end. end.
%% @spec (Args::[string()]) -> %% @spec (Args::[string()]) ->