diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-09-09 16:15:09 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-09-09 16:15:09 +0100 |
| commit | 7088e40de2a37f011f5a131dfd0a33c8c406426f (patch) | |
| tree | 33db49b350583cf121a33a004db8218f367551ad | |
| parent | 99ccc207256b47a7ff786614cc9162b2adbf8cb4 (diff) | |
| download | rabbitmq-server-git-7088e40de2a37f011f5a131dfd0a33c8c406426f.tar.gz | |
Fixed various QA remarks.
Renamed rotate_logs_all to rotate_logs.
logrotate will fail silently to logrotate
if calling rotate_logs on any of the logs
failed.
| -rw-r--r-- | docs/rabbitmq-multi.pod | 4 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/init.d | 3 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/init.d | 3 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 15 |
4 files changed, 12 insertions, 13 deletions
diff --git a/docs/rabbitmq-multi.pod b/docs/rabbitmq-multi.pod index 772ca70a20..7916fc7834 100644 --- a/docs/rabbitmq-multi.pod +++ b/docs/rabbitmq-multi.pod @@ -26,8 +26,8 @@ start_all I<count> stop_all stop all local RabbitMQ nodes -rotate_logs_all - rotate log files for all local RabbitMQ nodes +rotate_logs + rotate log files for all local and running RabbitMQ nodes =head1 EXAMPLES diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index a79765cc6c..d699f9b601 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -85,8 +85,7 @@ restart_rabbitmq () { rotate_logs_rabbitmq() { set +e - su $USER -s /bin/sh -c "$DAEMON rotate_logs_all ${ROTATE_SUFFIX}" 2>&1 - RETVAL=$? + su $USER -s /bin/sh -c "$DAEMON rotate_logs ${ROTATE_SUFFIX}" 2>&1 set -e } diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d index 278d76f04d..da9d70f2e4 100644 --- a/packaging/debs/Debian/debian/init.d +++ b/packaging/debs/Debian/debian/init.d @@ -55,8 +55,7 @@ stop_rabbitmq () { rotate_logs_rabbitmq() { set +e - su $USER -s /bin/sh -c "$DAEMON rotate_logs_all ${ROTATE_SUFFIX}" 2>&1 - RETVAL=$? + su $USER -s /bin/sh -c "$DAEMON rotate_logs ${ROTATE_SUFFIX}" 2>&1 set -e } diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 29f12ff717..4d00e660e2 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -94,10 +94,10 @@ action(stop_all, [], RpcTimeout) -> stop_nodes(NodePids, RpcTimeout), delete_pids_file() end); -action(rotate_logs_all, [], RpcTimeout) -> - action(rotate_logs_all, [""], RpcTimeout); +action(rotate_logs, [], RpcTimeout) -> + action(rotate_logs, [""], RpcTimeout); -action(rotate_logs_all, [Suffix], RpcTimeout) -> +action(rotate_logs, [Suffix], RpcTimeout) -> io:format("Rotating logs for all nodes...~n", []), call_all_nodes(fun(NodePids) -> rotate_logs(NodePids, @@ -283,11 +283,12 @@ is_dead(Pid) -> rotate_logs([], _, _) -> ok; rotate_logs([{Node, _} | Rest], BinarySuffix, RpcTimeout) -> - io:format("Rotating logs for node ~p~n", [Node]), + io:format("Rotating logs for node ~p", [Node]), case rpc:call(Node, rabbit, rotate_logs, [BinarySuffix], RpcTimeout) of - {badrpc, _} -> io:format("timeout"), - throw(rotate_logs_failed); - ok -> rotate_logs(Rest, BinarySuffix, RpcTimeout) + {badrpc, Error} -> io:format(": ~p.~n", [Error]), + throw(rotate_logs_failed); + ok -> io:format(": ok.~n", []), + rotate_logs(Rest, BinarySuffix, RpcTimeout) end. call_all_nodes(Func) -> |