diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-05-08 18:28:37 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-05-08 18:28:37 +0300 |
| commit | f8adbe976485f5fa7846a8fef711d95caad97f94 (patch) | |
| tree | c7a09c12631d79b278e1500895fabd011e05120e | |
| parent | 7132664520b09cf6e15dc95e91ce73eedd4407e4 (diff) | |
| download | rabbitmq-server-git-f8adbe976485f5fa7846a8fef711d95caad97f94.tar.gz | |
Rename rabbit.vhost_restart_strategy options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/rabbit_vhost_sup_sup.erl | 8 |
2 files changed, 7 insertions, 5 deletions
@@ -118,8 +118,8 @@ define PROJECT_ENV {proxy_protocol, false}, {disk_monitor_failure_retries, 10}, {disk_monitor_failure_retry_interval, 120000}, - %% can be stop_rabbit or give_up see rabbitmq-server-1458 - {vhost_restart_strategy, stop_rabbit} + %% either "stop_node" or "ignore" + {vhost_restart_strategy, stop_node} ] endef diff --git a/src/rabbit_vhost_sup_sup.erl b/src/rabbit_vhost_sup_sup.erl index 44744c4bda..e528d64e0e 100644 --- a/src/rabbit_vhost_sup_sup.erl +++ b/src/rabbit_vhost_sup_sup.erl @@ -43,9 +43,11 @@ start_link() -> supervisor2:start_link({local, ?MODULE}, ?MODULE, []). init([]) -> - VhostRestart = case application:get_env(rabbit, vhost_restart_strategy, stop_rabbit) of - give_up -> transient; - stop_rabbit -> permanent + VhostRestart = case application:get_env(rabbit, vhost_restart_strategy, stop_node) of + ignore -> transient; + stop_node -> permanent; + transient -> transient; + permanent -> permanent end, ets:new(?MODULE, [named_table, public, {keypos, #vhost_sup.vhost}]), |