diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 29 | ||||
| -rwxr-xr-x[-rw-r--r--] | packaging/RPMS/Fedora/rabbitmq-server.init | 3 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.logrotate | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | packaging/debs/Debian/debian/rabbitmq-server.init | 3 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.logrotate | 5 |
5 files changed, 14 insertions, 31 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index c9b699d634..a4ece7435e 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -261,32 +261,27 @@ </varlistentry> <varlistentry> - <term><cmdsynopsis><command>rotate_logs</command> <arg choice="req"><replaceable>suffix</replaceable></arg></cmdsynopsis></term> + <term><cmdsynopsis><command>rotate_logs</command></cmdsynopsis></term> <listitem> <para> - Instruct the RabbitMQ node to rotate the log files. + Instruct the RabbitMQ node to perform internal log rotation. </para> <para> - The RabbitMQ broker appends the contents of its log - files to files with names composed of the original name - and the suffix, and then resumes logging to freshly - created files at the original location. I.e. effectively - the current log contents are moved to the end of the - suffixed files. + Log rotation is performed according to lager settings + specified in configuration file. </para> <para> - When the target files do not exist they are created. When - no <option>suffix</option> is specified, no rotation takes - place - log files are just re-opened. + Note that there is no need to call this command in case of + external log rotation (e.g. from logrotate), because lager + detects renames and automatically reopens log files. </para> <para role="example-prefix">For example:</para> - <screen role="example">rabbitmqctl rotate_logs .1</screen> + <screen role="example">rabbitmqctl rotate_logs</screen> <para role="example"> - This command instructs the RabbitMQ node to append the contents - of the log files to files with names consisting of the original logs' - names and ".1" suffix, e.g. rabbit@mymachine.log.1 and - rabbit@mymachine-sasl.log.1. Finally, logging resumes to - fresh files at the old locations. + This command starts internal log rotation + process. Rotation is performed asynchronously, so there is + no guarantee that it will be completed when this command + returns. </para> </listitem> </varlistentry> diff --git a/packaging/RPMS/Fedora/rabbitmq-server.init b/packaging/RPMS/Fedora/rabbitmq-server.init index 15929108b5..90b48499fc 100644..100755 --- a/packaging/RPMS/Fedora/rabbitmq-server.init +++ b/packaging/RPMS/Fedora/rabbitmq-server.init @@ -24,7 +24,6 @@ DAEMON=/usr/sbin/${NAME} CONTROL=/usr/sbin/rabbitmqctl DESC=rabbitmq-server USER=rabbitmq -ROTATE_SUFFIX= PID_FILE=/var/run/rabbitmq/pid RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env @@ -125,7 +124,7 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - $CONTROL rotate_logs ${ROTATE_SUFFIX} + $CONTROL rotate_logs if [ $? != 0 ] ; then RETVAL=1 fi diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate index 6b657614de..21a9fc0b84 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.logrotate +++ b/packaging/RPMS/Fedora/rabbitmq-server.logrotate @@ -3,10 +3,5 @@ missingok rotate 20 compress - delaycompress notifempty - sharedscripts - postrotate - /sbin/service rabbitmq-server rotate-logs > /dev/null - endscript } diff --git a/packaging/debs/Debian/debian/rabbitmq-server.init b/packaging/debs/Debian/debian/rabbitmq-server.init index fce2d16401..f8801d9864 100644..100755 --- a/packaging/debs/Debian/debian/rabbitmq-server.init +++ b/packaging/debs/Debian/debian/rabbitmq-server.init @@ -22,7 +22,6 @@ DAEMON=/usr/sbin/${NAME} CONTROL=/usr/sbin/rabbitmqctl DESC="message broker" USER=rabbitmq -ROTATE_SUFFIX= PID_FILE=/var/run/rabbitmq/pid RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env @@ -106,7 +105,7 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - $CONTROL -q rotate_logs ${ROTATE_SUFFIX} + $CONTROL -q rotate_logs if [ $? != 0 ] ; then RETVAL=1 fi diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate index c786df77b2..21a9fc0b84 100644 --- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate +++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate @@ -3,10 +3,5 @@ missingok rotate 20 compress - delaycompress notifempty - sharedscripts - postrotate - /etc/init.d/rabbitmq-server rotate-logs > /dev/null - endscript } |