Rename rabbit.vhost_restart_strategy options

Author: michaelklishin

Makefile

@@ -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
 

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}]),