From 4f80dd13694d3c4abfce4dbf5499efe3534684a6 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 3 Jul 2020 09:05:35 +0700 Subject: [PATCH] Make RABBITMQ_ERLANG_COOKIE deprecation message pop [as in colors] --- deps/rabbitmq_cli/lib/rabbitmq/cli/core/ansi.ex | 16 ++++++++++++++++ .../lib/rabbitmq/cli/core/distribution.ex | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/ansi.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/ansi.ex index 628c3228cd..26f03b4c67 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/ansi.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/ansi.ex @@ -17,4 +17,20 @@ defmodule RabbitMQ.CLI.Core.ANSI do def bright(string) do "#{IO.ANSI.bright()}#{string}#{IO.ANSI.reset()}" end + + def red(string) do + "#{IO.ANSI.red()}#{string}#{IO.ANSI.reset()}" + end + + def yellow(string) do + "#{IO.ANSI.yellow()}#{string}#{IO.ANSI.reset()}" + end + + def bright_red(string) do + "#{IO.ANSI.bright()}#{IO.ANSI.red()}#{string}#{IO.ANSI.reset()}" + end + + def bright_yellow(string) do + "#{IO.ANSI.bright()}#{IO.ANSI.yellow()}#{string}#{IO.ANSI.reset()}" + end end diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex index 4f3c64ecbe..a45d3daeb7 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex @@ -14,7 +14,7 @@ ## Copyright (c) 2016-2020 VMware, Inc. or its affiliates. All rights reserved. defmodule RabbitMQ.CLI.Core.Distribution do - alias RabbitMQ.CLI.Core.{Config, Helpers} + alias RabbitMQ.CLI.Core.{ANSI, Config, Helpers} # # API @@ -118,8 +118,10 @@ defmodule RabbitMQ.CLI.Core.Distribution do case Config.output_less?(options) do true -> :ok false -> - IO.puts("RABBITMQ_ERLANG_COOKIE env variable support is deprecated and will be REMOVED in a future version. " <> - "Use the $HOME/.erlang.cookie file or the --erlang-cookie switch instead.") + warning = ANSI.bright_red("RABBITMQ_ERLANG_COOKIE env variable support is deprecated and will be REMOVED in a future version. ") <> + ANSI.yellow("Use the $HOME/.erlang.cookie file or the --erlang-cookie switch instead.") + + IO.puts(warning) end end end