summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'slave_wait_timeout_configurable' of ↵Michael Klishin2016-03-231-4/+13
|\ | | | | | | https://github.com/lemenkov/rabbitmq-server into lemenkov-slave_wait_timeout_configurable
| * Make slaves wait timeout configurable instead of hardcoded 15000Peter Lemenkov2016-03-231-4/+13
| | | | | | | | | | | | This slightly improves rabbitmq/rabbitmq-server#584 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
* | Merge branch 'stable'Michael Klishin2016-03-231-0/+4
|\ \ | |/ |/|
| * Update rabbitmq-components.mkMichael Klishin2016-03-231-0/+4
| |
* | Merge branch 'stable'Jean-Sébastien Pédron2016-03-182-7/+11
|\ \ | |/
| * rabbitmq-server: Remove trailing spacesJean-Sébastien Pédron2016-03-181-2/+1
| |
| * Do not warn about mising kernel polling on WindowsJean-Sébastien Pédron2016-03-181-5/+10
| | | | | | | | | | | | | | Erlang does not support kernel polling on Windows: there is no need to confuse users about this. Fixes #695.
* | Merge branch 'stable'Brandon Shroyer2016-03-181-1/+4
|\ \ | |/
| * Merge pull request #694 from rabbitmq/rabbitmq-server-693Brandon Shroyer2016-03-181-1/+4
| |\ | | | | | | "rabbitmqctl stop" exits with 0 if it fails to contact the node
| | * "rabbitmqctl stop" exits with 0 if it fails to contact the nodeJean-Sébastien Pédron2016-03-181-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rabbitmqctl fails to contact the node to ask it to stop, it still displays an error message. However, now it exits with 0; it was EX_UNAVAILABLE before. There are two main reasons it can happen: o The node is stopped, so that's ok to exit with 0 because the end result is the same. o The Erlang cookie is incorrect. The error message is here to help but this situation is quite rare compared to the other one. There is no way to distinguish both, so let's assume the common situation. This helps in the case of systemd in particular: if one stops RabbitMQ using "rabbitmqctl stop" instead of "service rabbitmq-server stop", systemd tries to call "rabbitmqctl stop" again. Before this change, it failed and put the service in a "failed" state. Fixes #693.
* | Merge branch 'stable'Jean-Sébastien Pédron2016-03-175-16/+158
|\ \ | |/
| * Merge pull request #666 from binarin/rabbitmq-server-664Jean-Sébastien Pédron2016-03-175-16/+158
| |\ | | | | | | Systemd improvements
| | * Check 'systemctl' usability for activaction checkAlexey Lebedeff2016-03-161-1/+8
| | |
| | * Support abstract unix socket for systemd notifyAlexey Lebedeff2016-03-161-1/+6
| | |
| | * Explicitly close `socat` portAlexey Lebedeff2016-03-111-5/+10
| | | | | | | | | | | | | | | Before that it happened implicitly due to the death of the controlling process. But it's better to make it explicit.
| | * Add an explanation about why `socat(1)` is usedAlexey Lebedeff2016-03-111-0/+9
| | |
| | * Improve systemd integrationAlexey Lebedeff2016-03-115-16/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this patch will fix all systemd-related problems: - Proxy shell process (which converts signals to `rabbitmqtl stop`) will no longer be started under systemd. There is no need in it, as systemd unit already contains instructions for graceful shutdown. - Ready notification for systemd will be sent with the help of `socat`, as `systemd-notify` is currently broken for non-root users. `socat` is the most lightweight way to do it (other options are using NIF or some external helper in Perl). - epmd will not be able to interfere by sending it's own ready notifications. - systemd journal will contain some additional messages about startup and shutdown sequence, just to be sure that everything is working correctly. Fixes #664
* | | Merge pull request #686 from bogdando/masterMichael Klishin2016-03-140-0/+0
|\ \ \ | | | | | | | | Revert "Private attributes usage in rabbitmq script"
| * | | Revert "Private attributes usage in rabbitmq script"Bogdan Dobrelya2016-03-111-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4aeaa79bc566c81bc7f5c20d7afbe39c32771aba. Related Fuel bug https://bugs.launchpad.net/fuel/+bug/1556123
* | | | Merge branch 'stable'Michael Klishin2016-03-111-9/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #685 from bogdando/bug/1556123Michael Klishin2016-03-111-9/+9
| |\ \ | | |/ | |/| Revert "Private attributes usage in rabbitmq script"
| | * Revert "Private attributes usage in rabbitmq script"Bogdan Dobrelya2016-03-111-9/+9
| |/ | | | | | | | | | | This reverts commit 4aeaa79bc566c81bc7f5c20d7afbe39c32771aba. Related Fuel bug https://bugs.launchpad.net/fuel/+bug/1556123
* | Merge branch 'stable'Daniil Fedotov2016-03-113-0/+66
|\ \ | |/
| * Merge pull request #674 from rabbitmq/rabbitmq-server-553Gabriele Santomaggio2016-03-103-0/+66
| |\ | | | | | | Verify that mandatory environment variables are (pre)set
| | * removed check_start_params on stop_rabbitmq_serverGabriele Santomaggio2016-03-101-2/+1
| | |
| | * variable unquotingDaniil Fedotov2016-03-092-2/+2
| | |
| | * remove debug echoDaniil Fedotov2016-03-091-2/+0
| | |
| | * moved check_not_empty controls, removed double quotesGabriele Santomaggio2016-03-081-9/+11
| | |
| | * fixed messageGabriele Santomaggio2016-03-081-1/+1
| | |
| | * more error detailsGabriele Santomaggio2016-03-081-1/+1
| | |
| | * removed double quotes for the variablesGabriele Santomaggio2016-03-081-3/+3
| | |
| | * mention RABBITMQ_CONF_ENV_FILEDaniil Fedotov2016-03-043-9/+12
| | |
| | * Don't install rabbitmq service if empty envDaniil Fedotov2016-03-031-0/+20
| | |
| | * Check for env variables in windows scriptDaniil Fedotov2016-03-031-10/+17
| | |
| | * Check env variables before startDaniil Fedotov2016-03-032-0/+37
| | |
* | | Merge branch 'stable'Daniil Fedotov2016-03-092-1/+7
|\ \ \ | |/ /
| * | Merge pull request #680 from binarin/rabbitmq-server-ctl-no-break-handlerrabbitmq_v3_6_2_milestone1Daniil Fedotov2016-03-091-1/+1
| |\ \ | | | | | | | | Disable erlang break handler in rabbitmqctl
| | * | Disable erlang break handler in rabbitmqctlAlexey Lebedeff2016-03-091-1/+1
| |/ / | | | | | | | | | | | | So rabbitmq operator will not be baffled by erlang break handler when he tries to interrupt some long-running `rabbitmqctl` command by `Ctrl-C`.
| * | Merge pull request #660 from rabbitmq/rabbitmq-server-659Gabriele Santomaggio2016-03-071-0/+6
| |\ \ | | | | | | | | Create rabbitmq.config on windows installation
| | * | fixed a small syntax errorGabriele Santomaggio2016-03-071-1/+1
| | | |
| | * | Move default config creation to rabbitmq-service.batDaniil Fedotov2016-03-042-9/+6
| | | |
| | * | Create rabbitmq.config on installationDaniil Fedotov2016-02-291-0/+9
| | | |
* | | | Merge branch 'stable'Michael Klishin2016-03-071-4/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #653 from dmitrymex/log-pidMichael Klishin2016-03-071-4/+5
| |\ \ \ | | | | | | | | | | [OCF HA] Log process id in RabbitMQ OCF script
| | * | | [OCF HA] Log process id in RabbitMQ OCF scriptDmitry Mescheryakov2016-02-251-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several OCF calls might run simultaneously. For example, it often happens that two monitor calls intersect. Logging current process id for each line helps distinguish logs of different calls. Also aligned get_status() logging with format used in all other parts of the script.
* | | | | Merge branch 'stable'Michael Klishin2016-03-041-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #572 from rabbitmq/rabbitmq-server-346Michael Klishin2016-03-041-1/+6
| |\ \ \ \ | | |_|_|/ | |/| | | Avoid hipe compile versioned modules
| | * | | Merge branch 'stable' into rabbitmq-server-346Michael Klishin2016-03-0415-749/+212
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Avoid hipe compile versioned modulesDiana Corbacho2016-02-251-1/+6
| | |/ / | | | | | | | | | | | | | | | | References #346. References #347.
* | | | Merge branch 'stable'Michael Klishin2016-03-033-616/+0
|\ \ \ \ | |/ / /