Merge branch 'stable'

This commit is contained in:
Michael Klishin 2017-09-20 14:38:22 -06:00
commit 0f6085ef4c
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
2 changed files with 14 additions and 2 deletions

View File

@ -6,12 +6,18 @@ After=syslog.target network.target
Type=notify
User=rabbitmq
Group=rabbitmq
NotifyAccess=all
TimeoutStartSec=3600
# The following setting will automatically restart RabbitMQ
# in the event of a failure. systemd service restarts are not a
# replacement for service monitoring. Please see
# http://www.rabbitmq.com/monitoring.html
Restart=on-failure # https://www.freedesktop.org/software/systemd/man/systemd.service.html#Restart=
RestartSec=10 # https://www.freedesktop.org/software/systemd/man/systemd.service.html#RestartSec=
WorkingDirectory=/var/lib/rabbitmq
ExecStart=/usr/sbin/rabbitmq-server
ExecStop=/usr/sbin/rabbitmqctl stop
ExecStop=/bin/sh -c "while ps -p $MAINPID >/dev/null 2>&1; do sleep 1; done"
NotifyAccess=all
TimeoutStartSec=3600
[Install]
WantedBy=multi-user.target

View File

@ -10,6 +10,12 @@ User=rabbitmq
Group=rabbitmq
NotifyAccess=all
TimeoutStartSec=3600
# The following setting will automatically restart RabbitMQ
# in the event of a failure. systemd service restarts are not a
# replacement for service monitoring. Please see
# http://www.rabbitmq.com/monitoring.html
Restart=on-failure # https://www.freedesktop.org/software/systemd/man/systemd.service.html#Restart=
RestartSec=10 # https://www.freedesktop.org/software/systemd/man/systemd.service.html#RestartSec=
WorkingDirectory=/var/lib/rabbitmq
ExecStart=/usr/lib/rabbitmq/bin/rabbitmq-server
ExecStop=/usr/lib/rabbitmq/bin/rabbitmqctl stop