diff options
218 files changed, 446 insertions, 1031 deletions
diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ index f1ba9a5ca1..99ef88e4ed 100644 --- a/LICENSE-MPL-RabbitMQ +++ b/LICENSE-MPL-RabbitMQ @@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License. The Original Code is RabbitMQ. The Initial Developer of the Original Code is Pivotal Software, Inc. - Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.'' + Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.'' [NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should @@ -51,4 +51,4 @@ RabbitMQ server is [licensed under the MPL 1.1](LICENSE-MPL-RabbitMQ). ## Copyright -(c) Pivotal Software Inc., 2007-2018. +(c) Pivotal Software Inc., 2007-2019. diff --git a/check_xref b/check_xref index 78f932dc89..4c7badf3a4 100755 --- a/check_xref +++ b/check_xref @@ -15,7 +15,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is Pivotal Software, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% main(["-h"]) -> diff --git a/docs/rabbitmq-echopid.8 b/docs/rabbitmq-echopid.8 index 04081f9581..095bc50ccb 100644 --- a/docs/rabbitmq-echopid.8 +++ b/docs/rabbitmq-echopid.8 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQ-ECHOPID.BAT 8 diff --git a/docs/rabbitmq-env.conf.5 b/docs/rabbitmq-env.conf.5 index 4d86d672e4..6b572dd50a 100644 --- a/docs/rabbitmq-env.conf.5 +++ b/docs/rabbitmq-env.conf.5 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQ-ENV.CONF 5 diff --git a/docs/rabbitmq-plugins.8 b/docs/rabbitmq-plugins.8 index 12383ca686..338399b3ad 100644 --- a/docs/rabbitmq-plugins.8 +++ b/docs/rabbitmq-plugins.8 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQ-PLUGINS 8 diff --git a/docs/rabbitmq-server.8 b/docs/rabbitmq-server.8 index 4c469d25d0..381bc62652 100644 --- a/docs/rabbitmq-server.8 +++ b/docs/rabbitmq-server.8 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQ-SERVER 8 diff --git a/docs/rabbitmq-service.8 b/docs/rabbitmq-service.8 index 12b7f28a33..d293fba7b5 100644 --- a/docs/rabbitmq-service.8 +++ b/docs/rabbitmq-service.8 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQ-SERVICE.BAT 8 diff --git a/docs/rabbitmqctl.8 b/docs/rabbitmqctl.8 index 524da897d1..3e395926d0 100644 --- a/docs/rabbitmqctl.8 +++ b/docs/rabbitmqctl.8 @@ -12,7 +12,7 @@ .\" The Original Code is RabbitMQ. .\" .\" The Initial Developer of the Original Code is Pivotal Software, Inc. -.\" Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +.\" Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. .\" .Dd April 25, 2017 .Dt RABBITMQCTL 8 diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index c4f584e87d..4d68ddab9d 100644 --- a/include/gm_specs.hrl +++ b/include/gm_specs.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is Pivotal Software, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -type callback_result() :: 'ok' | {'stop', any()} | {'become', atom(), args()}. diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index da28989c37..9bccb9a89e 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -554,7 +554,7 @@ end}. }. -{mapping, "msx_message_size", "rabbit.max_message_size", +{mapping, "max_message_size", "rabbit.max_message_size", [{datatype, integer}, {validators, ["less_then_512MB"]}]}. %% Customising Socket Options. @@ -1363,95 +1363,152 @@ end}. %% that are overly busy. Processes with large heaps or that take a %% long time to garbage collect will count toward this threshold. {mapping, "sysmon_handler.thresholds.busy_processes", "sysmon_handler.process_limit", [ - {default, 30}, - {datatype, integer}, - hidden + {datatype, integer}, + hidden ]}. +{translation, "sysmon_handler.process_limit", + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.thresholds.busy_processes", Conf, undefined) of + undefined -> + cuttlefish:unset(); + Int when is_integer(Int) -> + Int; + _ -> + cuttlefish:invalid("should be a non-negative integer") + end + end +}. + %% @doc The threshold at which to warn about the number of ports that %% are overly busy. Ports with full input buffers count toward this %% threshold. {mapping, "sysmon_handler.thresholds.busy_ports", "sysmon_handler.port_limit", [ - {default, 2}, {datatype, integer}, hidden ]}. +{translation, "sysmon_handler.port_limit", + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.thresholds.busy_ports", Conf, undefined) of + undefined -> + cuttlefish:unset(); + Int when is_integer(Int) -> + Int; + _ -> + cuttlefish:invalid("should be a non-negative integer") + end + end +}. + %% @doc A process will become busy when it exceeds this amount of time %% doing garbage collection. -%% -%% NOTE: Enabling this setting can cause performance problems on -%% multi-core systems. %% @see sysmon_handler.thresholds.busy_processes {mapping, "sysmon_handler.triggers.process.garbage_collection", "sysmon_handler.gc_ms_limit", [ - {default, off}, {datatype, [{atom, off}, {duration, ms}]}, hidden ]}. {translation, "sysmon_handler.gc_ms_limit", - fun(Conf) -> - case cuttlefish:conf_get("sysmon_handler.triggers.process.garbage_collection", Conf) of - off -> 0; - Int -> Int - end - end}. + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.triggers.process.garbage_collection", Conf, undefined) of + undefined -> + cuttlefish:unset(); + off -> + 0; + Int when is_integer(Int) -> + Int; + _ -> + cuttlefish:invalid("should be a non-negative integer") + end + end +}. %% @doc A process will become busy when it exceeds this amount of time %% during a single process scheduling & execution cycle. {mapping, "sysmon_handler.triggers.process.long_scheduled_execution", "sysmon_handler.schedule_ms_limit", [ - {default, off}, {datatype, [{atom, off}, {duration, ms}]}, hidden ]}. {translation, "sysmon_handler.schedule_ms_limit", - fun(Conf) -> - case cuttlefish:conf_get("sysmon_handler.triggers.process.long_scheduled_execution", Conf) of - off -> 0; - Int -> Int - end - end}. + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.triggers.process.long_scheduled_execution", Conf, undefined) of + undefined -> + cuttlefish:unset(); + off -> + 0; + Int when is_integer(Int) -> + Int; + _ -> + cuttlefish:invalid("should be a non-negative integer") + end + end +}. %% @doc A process will become busy when its heap exceeds this size. %% @see sysmon_handler.thresholds.busy_processes {mapping, "sysmon_handler.triggers.process.heap_size", "sysmon_handler.heap_word_limit", [ - {default, "160444000"}, - {datatype, [bytesize, {atom, off}]}, + {datatype, [{atom, off}, + bytesize]}, hidden ]}. {translation, "sysmon_handler.heap_word_limit", - fun(Conf) -> - case cuttlefish:conf_get("sysmon_handler.triggers.process.heap_size", Conf) of - off -> 0; - Bytes -> - WordSize = erlang:system_info(wordsize), - Bytes div WordSize + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.triggers.process.heap_size", Conf, undefined) of + undefined -> + cuttlefish:unset(); + off -> + 0; + Bytes when is_integer(Bytes) -> + WordSize = erlang:system_info(wordsize), + Bytes div WordSize; + _ -> + cuttlefish:invalid("should be a non-negative integer") + end end -end}. +}. %% @doc Whether ports with full input buffers will be counted as %% busy. Ports can represent open files or network sockets. %% @see sysmon_handler.thresholds.busy_ports {mapping, "sysmon_handler.triggers.port", "sysmon_handler.busy_port", [ - {default, on}, {datatype, flag}, hidden ]}. +{translation, "sysmon_handler.busy_port", + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.triggers.port", Conf, undefined) of + undefined -> + cuttlefish:unset(); + Val -> Val + end + end +}. + %% @doc Whether distribution ports with full input buffers will be %% counted as busy. Distribution ports connect Erlang nodes within a %% single cluster. %% @see sysmon_handler.thresholds.busy_ports {mapping, "sysmon_handler.triggers.distribution_port", "sysmon_handler.busy_dist_port", [ - {default, on}, {datatype, flag}, hidden ]}. +{translation, "sysmon_handler.busy_dist_port", + fun(Conf) -> + case cuttlefish:conf_get("sysmon_handler.triggers.distribution_port", Conf, undefined) of + undefined -> + cuttlefish:unset(); + Val -> Val + end + end +}. + % =============================== % Validators % =============================== diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 6d43e68ac7..0cc6bd544a 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -115,7 +115,7 @@ dep_lager = hex 3.6.5 dep_ra = git https://github.com/rabbitmq/ra.git master dep_ranch = hex 1.7.1 dep_recon = hex 2.3.6 -dep_sysmon_handler = hex 1.0.0 +dep_sysmon_handler = hex 1.1.0 RABBITMQ_COMPONENTS = amqp_client \ amqp10_common \ diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 37a8985892..8d176402dd 100755 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2012-2015 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2012-2019 Pivotal Software, Inc. All rights reserved. ## ### next line potentially updated in package install steps diff --git a/scripts/rabbitmq-diagnostics b/scripts/rabbitmq-diagnostics index 6366dff08d..3d2baa7e5d 100755 --- a/scripts/rabbitmq-diagnostics +++ b/scripts/rabbitmq-diagnostics @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## # Exit immediately if a pipeline, which may consist of a single simple command, diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat index 02bc9e5509..a7f8a324e7 100644 --- a/scripts/rabbitmq-diagnostics.bat +++ b/scripts/rabbitmq-diagnostics.bat @@ -12,7 +12,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
REM Scopes the variables to the current batch file
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index e0d269ea4e..f4b06c171b 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## if [ "$RABBITMQ_ENV_LOADED" = 1 ]; then diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 6e4cf93cda..7b0ea7aeb2 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## # Exit immediately if a pipeline, which may consist of a single simple command, diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index 120830f5a6..4f0c774292 100644 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -13,7 +13,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
setlocal
diff --git a/scripts/rabbitmq-queues b/scripts/rabbitmq-queues index 13a3aca8a6..9c814abb93 100755 --- a/scripts/rabbitmq-queues +++ b/scripts/rabbitmq-queues @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## # Exit immediately if a pipeline, which may consist of a single simple command, diff --git a/scripts/rabbitmq-queues.bat b/scripts/rabbitmq-queues.bat index 359faf76f5..43a51a77ca 100644 --- a/scripts/rabbitmq-queues.bat +++ b/scripts/rabbitmq-queues.bat @@ -12,7 +12,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
REM Scopes the variables to the current batch file
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index f0c4030529..b205785b33 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## set -e diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 4d12d2f31a..41677775f7 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -12,7 +12,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
setlocal
@@ -282,4 +282,3 @@ EXIT /B 0 endlocal
endlocal
endlocal
-
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 73a91b9a1e..57a9587ced 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -12,7 +12,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
setlocal
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 86092bec5c..fec0ae293b 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -12,7 +12,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +## Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. ## # Exit immediately if a pipeline, which may consist of a single simple command, diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index 1686073377..4ce3098708 100644 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat @@ -12,7 +12,7 @@ REM REM The Original Code is RabbitMQ.
REM
REM The Initial Developer of the Original Code is GoPivotal, Inc.
-REM Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
+REM Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved.
REM
REM Scopes the variables to the current batch file
diff --git a/src/background_gc.erl b/src/background_gc.erl index bbac3138cf..43c109ee2a 100644 --- a/src/background_gc.erl +++ b/src/background_gc.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(background_gc). diff --git a/src/code_server_cache.erl b/src/code_server_cache.erl index a7acdd7fdb..efa53a8009 100644 --- a/src/code_server_cache.erl +++ b/src/code_server_cache.erl @@ -13,7 +13,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(code_server_cache). diff --git a/src/dtree.erl b/src/dtree.erl index e8b3481b36..08ddd22532 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% A dual-index tree. diff --git a/src/gatherer.erl b/src/gatherer.erl index 7cc282442f..a8b55892c1 100644 --- a/src/gatherer.erl +++ b/src/gatherer.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(gatherer). diff --git a/src/gm.erl b/src/gm.erl index 6c0a786c33..427fa78f4e 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(gm). diff --git a/src/lager_exchange_backend.erl b/src/lager_exchange_backend.erl index 20ed88bc47..cbff53aaa3 100644 --- a/src/lager_exchange_backend.erl +++ b/src/lager_exchange_backend.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% @doc RabbitMQ backend for lager. diff --git a/src/lqueue.erl b/src/lqueue.erl index 2b75ef4856..acfdbe79ef 100644 --- a/src/lqueue.erl +++ b/src/lqueue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(lqueue). diff --git a/src/mirrored_supervisor_sups.erl b/src/mirrored_supervisor_sups.erl index 404b86f808..97c6213509 100644 --- a/src/mirrored_supervisor_sups.erl +++ b/src/mirrored_supervisor_sups.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(mirrored_supervisor_sups). diff --git a/src/rabbit.erl b/src/rabbit.erl index 2a37d0ba75..c8c6968ab0 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit). @@ -523,6 +523,7 @@ start_apps(Apps) -> start_apps(Apps, RestartTypes) -> app_utils:load_applications(Apps), + ensure_sysmon_handler_app_config(), ConfigEntryDecoder = case application:get_env(rabbit, config_entry_decoder) of undefined -> []; @@ -553,7 +554,6 @@ start_apps(Apps, RestartTypes) -> PassPhrase }, decrypt_config(Apps, Algo), - OrderedApps = app_utils:app_dependency_order(Apps, false), case lists:member(rabbit, Apps) of false -> rabbit_boot_steps:run_boot_steps(Apps); %% plugin activation @@ -563,6 +563,30 @@ start_apps(Apps, RestartTypes) -> handle_app_error(could_not_start), RestartTypes). +%% rabbitmq/rabbitmq-server#952 +%% This function is to be called after configuration has been optionally generated +%% and the sysmon_handler application loaded, but not started. It will ensure that +%% sane defaults are used for configuration settings that haven't been set by the +%% user +ensure_sysmon_handler_app_config() -> + Defaults = [ + {process_limit, 100}, + {port_limit, 100}, + {gc_ms_limit, 0}, + {schedule_ms_limit, 0}, + {heap_word_limit, 10485760}, + {busy_port, false}, + {busy_dist_port, true} + ], + lists:foreach(fun({K, V}) -> + case application:get_env(sysmon_handler, K) of + undefined -> + application:set_env(sysmon_handler, K, V); + _ -> + ok + end + end, Defaults). + %% This function retrieves the correct IoDevice for requesting %% input. The problem with using the default IoDevice is that %% the Erlang shell prevents us from getting the input. diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 020e48ba5a..4356cb427f 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_access_control). diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index e08f77d236..789992cb3d 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% There are two types of alarms handled by this module: %% diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index ba4dd74259..fe73e760b2 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_amqqueue). diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 37ee8d0a15..a4a044f1e4 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_amqqueue_process). diff --git a/src/rabbit_amqqueue_sup.erl b/src/rabbit_amqqueue_sup.erl index ed0595d3e3..54a97b717e 100644 --- a/src/rabbit_amqqueue_sup.erl +++ b/src/rabbit_amqqueue_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_amqqueue_sup). diff --git a/src/rabbit_amqqueue_sup_sup.erl b/src/rabbit_amqqueue_sup_sup.erl index f0bcbd7c60..d8045276c6 100644 --- a/src/rabbit_amqqueue_sup_sup.erl +++ b/src/rabbit_amqqueue_sup_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_amqqueue_sup_sup). diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl index af19352c70..83580e8b9c 100644 --- a/src/rabbit_auth_backend_internal.erl +++ b/src/rabbit_auth_backend_internal.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_auth_backend_internal). diff --git a/src/rabbit_auth_mechanism_amqplain.erl b/src/rabbit_auth_mechanism_amqplain.erl index 9016d0d51a..6ae0512a47 100644 --- a/src/rabbit_auth_mechanism_amqplain.erl +++ b/src/rabbit_auth_mechanism_amqplain.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_auth_mechanism_amqplain). diff --git a/src/rabbit_auth_mechanism_cr_demo.erl b/src/rabbit_auth_mechanism_cr_demo.erl index 9d4289602c..0cce728525 100644 --- a/src/rabbit_auth_mechanism_cr_demo.erl +++ b/src/rabbit_auth_mechanism_cr_demo.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_auth_mechanism_cr_demo). diff --git a/src/rabbit_auth_mechanism_plain.erl b/src/rabbit_auth_mechanism_plain.erl index 7a34b0a112..cf98bb72d0 100644 --- a/src/rabbit_auth_mechanism_plain.erl +++ b/src/rabbit_auth_mechanism_plain.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_auth_mechanism_plain). diff --git a/src/rabbit_autoheal.erl b/src/rabbit_autoheal.erl index 5324858c28..8a61a18e85 100644 --- a/src/rabbit_autoheal.erl +++ b/src/rabbit_autoheal.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_autoheal). diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index 22ceefb85f..6cb91a9243 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_basic). diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 258e85ffa2..3a9c9b4427 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_binding). diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 14ce54c949..805d9f538f 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_channel). diff --git a/src/rabbit_channel_interceptor.erl b/src/rabbit_channel_interceptor.erl index f01c7feb6f..f8b0331592 100644 --- a/src/rabbit_channel_interceptor.erl +++ b/src/rabbit_channel_interceptor.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_channel_interceptor). diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl index d4fefd548d..e2e24e2f38 100644 --- a/src/rabbit_channel_sup.erl +++ b/src/rabbit_channel_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_channel_sup). diff --git a/src/rabbit_channel_sup_sup.erl b/src/rabbit_channel_sup_sup.erl index f728250c90..d39e3f3e9b 100644 --- a/src/rabbit_channel_sup_sup.erl +++ b/src/rabbit_channel_sup_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_channel_sup_sup). diff --git a/src/rabbit_client_sup.erl b/src/rabbit_client_sup.erl index 3eaa58a043..982c1d1e62 100644 --- a/src/rabbit_client_sup.erl +++ b/src/rabbit_client_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_client_sup). diff --git a/src/rabbit_connection_helper_sup.erl b/src/rabbit_connection_helper_sup.erl index 23058ed040..8c4ba88da2 100644 --- a/src/rabbit_connection_helper_sup.erl +++ b/src/rabbit_connection_helper_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_helper_sup). diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl index 7ec5262448..6e85514d44 100644 --- a/src/rabbit_connection_sup.erl +++ b/src/rabbit_connection_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_sup). diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl index 30932bb1b0..99078d6df2 100644 --- a/src/rabbit_connection_tracking.erl +++ b/src/rabbit_connection_tracking.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_tracking). diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl index ca13700da0..19b6f8ab40 100644 --- a/src/rabbit_connection_tracking_handler.erl +++ b/src/rabbit_connection_tracking_handler.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_tracking_handler). diff --git a/src/rabbit_control_pbe.erl b/src/rabbit_control_pbe.erl index 40d8741d74..fa88b44e84 100644 --- a/src/rabbit_control_pbe.erl +++ b/src/rabbit_control_pbe.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_control_pbe). diff --git a/src/rabbit_core_metrics_gc.erl b/src/rabbit_core_metrics_gc.erl index 375fe51967..c8b3ad10b8 100644 --- a/src/rabbit_core_metrics_gc.erl +++ b/src/rabbit_core_metrics_gc.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_core_metrics_gc). diff --git a/src/rabbit_credential_validation.erl b/src/rabbit_credential_validation.erl index c502760baa..4b24d35f9d 100644 --- a/src/rabbit_credential_validation.erl +++ b/src/rabbit_credential_validation.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_credential_validation). diff --git a/src/rabbit_credential_validator.erl b/src/rabbit_credential_validator.erl index 53acacd6e6..1fe9b32667 100644 --- a/src/rabbit_credential_validator.erl +++ b/src/rabbit_credential_validator.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_credential_validator). diff --git a/src/rabbit_credential_validator_accept_everything.erl b/src/rabbit_credential_validator_accept_everything.erl index 053d54d871..f74e82007b 100644 --- a/src/rabbit_credential_validator_accept_everything.erl +++ b/src/rabbit_credential_validator_accept_everything.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_credential_validator_accept_everything). diff --git a/src/rabbit_credential_validator_min_password_length.erl b/src/rabbit_credential_validator_min_password_length.erl index aa368a3b94..169020ab2c 100644 --- a/src/rabbit_credential_validator_min_password_length.erl +++ b/src/rabbit_credential_validator_min_password_length.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_credential_validator_min_password_length). diff --git a/src/rabbit_credential_validator_password_regexp.erl b/src/rabbit_credential_validator_password_regexp.erl index 03c7c4cf7b..e1dd184981 100644 --- a/src/rabbit_credential_validator_password_regexp.erl +++ b/src/rabbit_credential_validator_password_regexp.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% diff --git a/src/rabbit_dead_letter.erl b/src/rabbit_dead_letter.erl index bf77f2d832..71ad8814b1 100644 --- a/src/rabbit_dead_letter.erl +++ b/src/rabbit_dead_letter.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_dead_letter). diff --git a/src/rabbit_diagnostics.erl b/src/rabbit_diagnostics.erl index 19082c0487..115f153cff 100644 --- a/src/rabbit_diagnostics.erl +++ b/src/rabbit_diagnostics.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_diagnostics). @@ -113,12 +113,12 @@ info(Pid, Infos, Default) -> get_time() -> {{Y,M,D}, {H,Min,Sec}} = calendar:local_time(), - [ integer_to_list(Y), "-", - prefix_zero(integer_to_list(M)), "-", + [ integer_to_list(Y), "-", + prefix_zero(integer_to_list(M)), "-", prefix_zero(integer_to_list(D)), " ", - prefix_zero(integer_to_list(H)), ":", - prefix_zero(integer_to_list(Min)), ":", - prefix_zero(integer_to_list(Sec)) + prefix_zero(integer_to_list(H)), ":", + prefix_zero(integer_to_list(Min)), ":", + prefix_zero(integer_to_list(Sec)) ]. prefix_zero([C]) -> [$0, C]; diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 9db543e19a..f45ba3b1ca 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_direct). diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index 868fc1a4aa..3ba1f35a6b 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_disk_monitor). @@ -236,14 +236,14 @@ parse_free_win32(CommandResult) -> [{capture, all_but_first, list}]), list_to_integer(lists:reverse(Free)). -interpret_limit({mem_relative, Relative}) +interpret_limit({mem_relative, Relative}) when is_number(Relative) -> round(Relative * vm_memory_monitor:get_total_memory()); -interpret_limit(Absolute) -> +interpret_limit(Absolute) -> case rabbit_resource_monitor_misc:parse_information_unit(Absolute) of {ok, ParsedAbsolute} -> ParsedAbsolute; {error, parse_error} -> - rabbit_log:error("Unable to parse disk_free_limit value ~p", + rabbit_log:error("Unable to parse disk_free_limit value ~p", [Absolute]), ?DEFAULT_DISK_FREE_LIMIT end. diff --git a/src/rabbit_epmd_monitor.erl b/src/rabbit_epmd_monitor.erl index 1a14a640d5..15c7489e99 100644 --- a/src/rabbit_epmd_monitor.erl +++ b/src/rabbit_epmd_monitor.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_epmd_monitor). diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 92e3f9acbd..9c879ad041 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange). diff --git a/src/rabbit_exchange_decorator.erl b/src/rabbit_exchange_decorator.erl index 58df5b87be..38fe12f669 100644 --- a/src/rabbit_exchange_decorator.erl +++ b/src/rabbit_exchange_decorator.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_decorator). @@ -76,7 +76,7 @@ added_to_rabbit_registry(_Type, _ModuleName) -> [maybe_recover(X) || X <- rabbit_exchange:list()], ok. -removed_from_rabbit_registry(_Type) -> +removed_from_rabbit_registry(_Type) -> [maybe_recover(X) || X <- rabbit_exchange:list()], ok. diff --git a/src/rabbit_exchange_parameters.erl b/src/rabbit_exchange_parameters.erl index 2c95a823ee..b093620620 100644 --- a/src/rabbit_exchange_parameters.erl +++ b/src/rabbit_exchange_parameters.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_parameters). diff --git a/src/rabbit_exchange_type_direct.erl b/src/rabbit_exchange_type_direct.erl index 9adcd2d297..4c3967d62f 100644 --- a/src/rabbit_exchange_type_direct.erl +++ b/src/rabbit_exchange_type_direct.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_type_direct). diff --git a/src/rabbit_exchange_type_fanout.erl b/src/rabbit_exchange_type_fanout.erl index 539bd763a1..dcfde14184 100644 --- a/src/rabbit_exchange_type_fanout.erl +++ b/src/rabbit_exchange_type_fanout.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_type_fanout). diff --git a/src/rabbit_exchange_type_headers.erl b/src/rabbit_exchange_type_headers.erl index 0d5d92c0da..4d6d49ef58 100644 --- a/src/rabbit_exchange_type_headers.erl +++ b/src/rabbit_exchange_type_headers.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_type_headers). diff --git a/src/rabbit_exchange_type_invalid.erl b/src/rabbit_exchange_type_invalid.erl index e945365aff..74b557c14f 100644 --- a/src/rabbit_exchange_type_invalid.erl +++ b/src/rabbit_exchange_type_invalid.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_type_invalid). diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl index 5ff5071405..0fa4a2fac0 100644 --- a/src/rabbit_exchange_type_topic.erl +++ b/src/rabbit_exchange_type_topic.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_exchange_type_topic). diff --git a/src/rabbit_fhc_helpers.erl b/src/rabbit_fhc_helpers.erl index 5f19eff087..90833795da 100644 --- a/src/rabbit_fhc_helpers.erl +++ b/src/rabbit_fhc_helpers.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_fhc_helpers). diff --git a/src/rabbit_fifo_client.erl b/src/rabbit_fifo_client.erl index 70793d6943..dfbf2f477a 100644 --- a/src/rabbit_fifo_client.erl +++ b/src/rabbit_fifo_client.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% @doc Provides an easy to consume API for interacting with the {@link rabbit_fifo.} diff --git a/src/rabbit_file.erl b/src/rabbit_file.erl index d8e215bfc5..557bc6f02a 100644 --- a/src/rabbit_file.erl +++ b/src/rabbit_file.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_file). diff --git a/src/rabbit_framing.erl b/src/rabbit_framing.erl index 5ed83aee7e..58ac0c6b6e 100644 --- a/src/rabbit_framing.erl +++ b/src/rabbit_framing.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% TODO auto-generate diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl index bd2e7e167b..386702e86b 100644 --- a/src/rabbit_guid.erl +++ b/src/rabbit_guid.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_guid). diff --git a/src/rabbit_health_check.erl b/src/rabbit_health_check.erl index d8d4cc240b..54508bfdb0 100644 --- a/src/rabbit_health_check.erl +++ b/src/rabbit_health_check.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_health_check). diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl index da40f207de..35304f13e0 100644 --- a/src/rabbit_lager.erl +++ b/src/rabbit_lager.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_lager). diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index 241654991c..b5f09a525b 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% The purpose of the limiter is to stem the flow of messages from diff --git a/src/rabbit_looking_glass.erl b/src/rabbit_looking_glass.erl index 1e9b2032d8..24b6cfce3d 100644 --- a/src/rabbit_looking_glass.erl +++ b/src/rabbit_looking_glass.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_looking_glass). diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index 06ffb77b67..62cf87fb11 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% diff --git a/src/rabbit_metrics.erl b/src/rabbit_metrics.erl index aa9343cf88..2a0a967e86 100644 --- a/src/rabbit_metrics.erl +++ b/src/rabbit_metrics.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_metrics). diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index c6e23bf21f..f2426e156f 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_coordinator). diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 04353423cc..4cc6856442 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_master). diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index d245372603..ac933d4df4 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_misc). diff --git a/src/rabbit_mirror_queue_mode.erl b/src/rabbit_mirror_queue_mode.erl index 47b150b5a0..e0bb3e6d24 100644 --- a/src/rabbit_mirror_queue_mode.erl +++ b/src/rabbit_mirror_queue_mode.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_mode). diff --git a/src/rabbit_mirror_queue_mode_all.erl b/src/rabbit_mirror_queue_mode_all.erl index 5742cd3963..8f88c10e5b 100644 --- a/src/rabbit_mirror_queue_mode_all.erl +++ b/src/rabbit_mirror_queue_mode_all.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_mode_all). diff --git a/src/rabbit_mirror_queue_mode_exactly.erl b/src/rabbit_mirror_queue_mode_exactly.erl index c2ffa39f59..ecbf723534 100644 --- a/src/rabbit_mirror_queue_mode_exactly.erl +++ b/src/rabbit_mirror_queue_mode_exactly.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_mode_exactly). diff --git a/src/rabbit_mirror_queue_mode_nodes.erl b/src/rabbit_mirror_queue_mode_nodes.erl index 31c55722a5..2ec972f162 100644 --- a/src/rabbit_mirror_queue_mode_nodes.erl +++ b/src/rabbit_mirror_queue_mode_nodes.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_mode_nodes). diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 5a0059955e..61f27a4a83 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mirror_queue_slave). diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 401b4a5545..4760a9432e 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mnesia). diff --git a/src/rabbit_mnesia_rename.erl b/src/rabbit_mnesia_rename.erl index 1111c587ad..c6648ac802 100644 --- a/src/rabbit_mnesia_rename.erl +++ b/src/rabbit_mnesia_rename.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_mnesia_rename). diff --git a/src/rabbit_msg_file.erl b/src/rabbit_msg_file.erl index eb23d3a7e5..f2496cd71f 100644 --- a/src/rabbit_msg_file.erl +++ b/src/rabbit_msg_file.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_msg_file). diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 76976ad771..bae8364614 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_msg_store). diff --git a/src/rabbit_msg_store_ets_index.erl b/src/rabbit_msg_store_ets_index.erl index fa8b504e5f..b25cf1502f 100644 --- a/src/rabbit_msg_store_ets_index.erl +++ b/src/rabbit_msg_store_ets_index.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_msg_store_ets_index). diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl index 728c9652d0..d11d110abf 100644 --- a/src/rabbit_msg_store_gc.erl +++ b/src/rabbit_msg_store_gc.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_msg_store_gc). diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index cf431ee04f..54f4b8a87d 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_networking). diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 7ecf6e33bf..4a5dea6073 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_node_monitor). diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index e6131265b0..3a27ce8dc9 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -12,7 +12,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_nodes). diff --git a/src/rabbit_parameter_validation.erl b/src/rabbit_parameter_validation.erl index eb116bbe9f..57469ca729 100644 --- a/src/rabbit_parameter_validation.erl +++ b/src/rabbit_parameter_validation.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_parameter_validation). diff --git a/src/rabbit_password.erl b/src/rabbit_password.erl index 9b8ea150af..5bec269af8 100644 --- a/src/rabbit_password.erl +++ b/src/rabbit_password.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_password). diff --git a/src/rabbit_password_hashing_md5.erl b/src/rabbit_password_hashing_md5.erl index ac71bcfbef..a8b4bb9875 100644 --- a/src/rabbit_password_hashing_md5.erl +++ b/src/rabbit_password_hashing_md5.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% Legacy hashing implementation, only used as a last resort when diff --git a/src/rabbit_password_hashing_sha256.erl b/src/rabbit_password_hashing_sha256.erl index 9381dbf5b0..1a503523ab 100644 --- a/src/rabbit_password_hashing_sha256.erl +++ b/src/rabbit_password_hashing_sha256.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_password_hashing_sha256). diff --git a/src/rabbit_password_hashing_sha512.erl b/src/rabbit_password_hashing_sha512.erl index beb7fa532e..0664b2dbea 100644 --- a/src/rabbit_password_hashing_sha512.erl +++ b/src/rabbit_password_hashing_sha512.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_password_hashing_sha512). diff --git a/src/rabbit_peer_discovery.erl b/src/rabbit_peer_discovery.erl index 9c8aa90e18..2f4acee49e 100644 --- a/src/rabbit_peer_discovery.erl +++ b/src/rabbit_peer_discovery.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is Pivotal Software, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery). diff --git a/src/rabbit_peer_discovery_classic_config.erl b/src/rabbit_peer_discovery_classic_config.erl index 96d47d8182..6597d77da4 100644 --- a/src/rabbit_peer_discovery_classic_config.erl +++ b/src/rabbit_peer_discovery_classic_config.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery_classic_config). diff --git a/src/rabbit_peer_discovery_dns.erl b/src/rabbit_peer_discovery_dns.erl index 7422876c4d..ad277e08b0 100644 --- a/src/rabbit_peer_discovery_dns.erl +++ b/src/rabbit_peer_discovery_dns.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery_dns). @@ -102,7 +102,7 @@ lookup(SeedHostname, LongNamesUsed, IPv) -> IPs = inet_res:lookup(SeedHostname, in, decode_record(IPv)), rabbit_log:info("Addresses discovered via ~s records of ~s: ~s", [string:to_upper(atom_to_list(decode_record(IPv))), - SeedHostname, + SeedHostname, string:join([inet_parse:ntoa(IP) || IP <- IPs], ", ")]), Hosts = [extract_host(inet:gethostbyaddr(A), LongNamesUsed, A) || A <- IPs], diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index ee54733e25..80f70a1b7f 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_plugins). diff --git a/src/rabbit_policies.erl b/src/rabbit_policies.erl index 43f59f17d5..555e4e2e87 100644 --- a/src/rabbit_policies.erl +++ b/src/rabbit_policies.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_policies). diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index d1dd301f5f..7f07b205ff 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_policy). diff --git a/src/rabbit_policy_merge_strategy.erl b/src/rabbit_policy_merge_strategy.erl index 3c6c6f07ee..57f4c742c4 100644 --- a/src/rabbit_policy_merge_strategy.erl +++ b/src/rabbit_policy_merge_strategy.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_policy_merge_strategy). diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index e43cba728a..8d13a16e0b 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_prelaunch). diff --git a/src/rabbit_prequeue.erl b/src/rabbit_prequeue.erl index 5b2c24acab..63dbec545b 100644 --- a/src/rabbit_prequeue.erl +++ b/src/rabbit_prequeue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_prequeue). @@ -97,4 +97,3 @@ handle_cast(_Msg, _State) -> exit(unreachable). handle_info(_Msg, _State) -> exit(unreachable). terminate(_Reason, _State) -> exit(unreachable). code_change(_OldVsn, _State, _Extra) -> exit(unreachable). - diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl index 7b75dd4afd..b41511f874 100644 --- a/src/rabbit_priority_queue.erl +++ b/src/rabbit_priority_queue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2015-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_priority_queue). diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl index 461bcabf11..e52156f60d 100644 --- a/src/rabbit_queue_collector.erl +++ b/src/rabbit_queue_collector.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_collector). diff --git a/src/rabbit_queue_decorator.erl b/src/rabbit_queue_decorator.erl index 512fe4c874..0c234e1072 100644 --- a/src/rabbit_queue_decorator.erl +++ b/src/rabbit_queue_decorator.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_decorator). diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index e9776f47ad..9785ae170d 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_index). diff --git a/src/rabbit_queue_location_client_local.erl b/src/rabbit_queue_location_client_local.erl index 0d4af99a03..aa07637ab1 100644 --- a/src/rabbit_queue_location_client_local.erl +++ b/src/rabbit_queue_location_client_local.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_location_client_local). diff --git a/src/rabbit_queue_location_min_masters.erl b/src/rabbit_queue_location_min_masters.erl index 7c386855f6..a3a3021229 100644 --- a/src/rabbit_queue_location_min_masters.erl +++ b/src/rabbit_queue_location_min_masters.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_location_min_masters). @@ -67,4 +67,4 @@ queue_master_location(#amqqueue{} = Q) -> end, init, MastersPerNode), - {ok, MinNode}.
\ No newline at end of file + {ok, MinNode}. diff --git a/src/rabbit_queue_location_random.erl b/src/rabbit_queue_location_random.erl index 83fd8cd519..a92c178dfe 100644 --- a/src/rabbit_queue_location_random.erl +++ b/src/rabbit_queue_location_random.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_location_random). diff --git a/src/rabbit_queue_location_validator.erl b/src/rabbit_queue_location_validator.erl index e70bcd314a..68a4bc3e06 100644 --- a/src/rabbit_queue_location_validator.erl +++ b/src/rabbit_queue_location_validator.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_location_validator). diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl index c2cc489ec2..6df7e5db6f 100644 --- a/src/rabbit_queue_master_location_misc.erl +++ b/src/rabbit_queue_master_location_misc.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_queue_master_location_misc). diff --git a/src/rabbit_quorum_memory_manager.erl b/src/rabbit_quorum_memory_manager.erl index f567561f31..28c1711e5b 100644 --- a/src/rabbit_quorum_memory_manager.erl +++ b/src/rabbit_quorum_memory_manager.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_quorum_memory_manager). diff --git a/src/rabbit_quorum_queue.erl b/src/rabbit_quorum_queue.erl index 864977f650..429be39067 100644 --- a/src/rabbit_quorum_queue.erl +++ b/src/rabbit_quorum_queue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_quorum_queue). diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 8370d08ed9..9a4c143c54 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_reader). diff --git a/src/rabbit_recovery_terms.erl b/src/rabbit_recovery_terms.erl index b73f3add7c..ab70fa2be7 100644 --- a/src/rabbit_recovery_terms.erl +++ b/src/rabbit_recovery_terms.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% We use a gen_server simply so that during the terminate/2 call diff --git a/src/rabbit_restartable_sup.erl b/src/rabbit_restartable_sup.erl index 14b8fd9a5f..ecbd10a3d7 100644 --- a/src/rabbit_restartable_sup.erl +++ b/src/rabbit_restartable_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_restartable_sup). diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl index 396a20c6b2..915f4c2d93 100644 --- a/src/rabbit_router.erl +++ b/src/rabbit_router.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_router). diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index ab39d86659..3540913ab9 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_runtime_parameters). diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index 6a87d93a29..07bd57fa24 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_ssl). diff --git a/src/rabbit_sup.erl b/src/rabbit_sup.erl index 38d561fa80..a1a0e4897d 100644 --- a/src/rabbit_sup.erl +++ b/src/rabbit_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_sup). diff --git a/src/rabbit_sysmon_handler.erl b/src/rabbit_sysmon_handler.erl index 4e878f618d..a4759b2e16 100644 --- a/src/rabbit_sysmon_handler.erl +++ b/src/rabbit_sysmon_handler.erl @@ -1,5 +1,5 @@ %% Copyright (c) 2011 Basho Technologies, Inc. All Rights Reserved. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% %% This file is provided to you under the Apache License, %% Version 2.0 (the "License"); you may not use this file @@ -91,6 +91,11 @@ handle_event({monitor, PidOrPort, Type, Info}, State=#state{timer_ref=TimerRef}) {Fmt, Args} = format_pretty_proc_or_port_info(PidOrPort), rabbit_log:warning("~p ~w ~w " ++ Fmt ++ " ~w", [?MODULE, Type, PidOrPort] ++ Args ++ [Info]), {ok, State#state{timer_ref=NewTimerRef}}; +handle_event({suppressed, Type, Info}, State=#state{timer_ref=TimerRef}) -> + %% Reset the inactivity timeout + NewTimerRef = reset_timer(TimerRef), + rabbit_log:debug("~p encountered a suppressed event of type ~w: ~w", [?MODULE, Type, Info]), + {ok, State#state{timer_ref=NewTimerRef}}; handle_event(Event, State=#state{timer_ref=TimerRef}) -> NewTimerRef = reset_timer(TimerRef), rabbit_log:warning("~p unhandled event: ~p", [?MODULE, Event]), diff --git a/src/rabbit_sysmon_minder.erl b/src/rabbit_sysmon_minder.erl index b2f5dd6316..42cf1179eb 100644 --- a/src/rabbit_sysmon_minder.erl +++ b/src/rabbit_sysmon_minder.erl @@ -1,6 +1,6 @@ %% ------------------------------------------------------------------- %% Copyright (c) 2007-2010 Basho Technologies, Inc. All Rights Reserved. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% %% This file is provided to you under the Apache License, %% Version 2.0 (the "License"); you may not use this file diff --git a/src/rabbit_table.erl b/src/rabbit_table.erl index f77a23bf5e..1fab94fe34 100644 --- a/src/rabbit_table.erl +++ b/src/rabbit_table.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_table). diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl index 5b8676bac1..6047eb24a3 100644 --- a/src/rabbit_trace.erl +++ b/src/rabbit_trace.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_trace). diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index ed2143a2b9..07eef293d3 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_upgrade). diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index 5c91ed7c2b..449d57b823 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_upgrade_functions). diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 83738b7e52..4da073a518 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_variable_queue). diff --git a/src/rabbit_version.erl b/src/rabbit_version.erl index 710e89922e..5b1722fdbf 100644 --- a/src/rabbit_version.erl +++ b/src/rabbit_version.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_version). diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index e462fc6bc0..cf12d04ce8 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost). @@ -336,4 +336,3 @@ info_all(Ref, AggregatorPid) -> info_all(?INFO_KEYS, Ref, AggregatorPid). info_all(Items, Ref, AggregatorPid) -> rabbit_control_misc:emitting_map( AggregatorPid, Ref, fun(VHost) -> info(VHost, Items) end, list()). - diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index 9d8a6795b4..704cff92e2 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost_limit). diff --git a/src/rabbit_vhost_msg_store.erl b/src/rabbit_vhost_msg_store.erl index df10883707..b43cf096bc 100644 --- a/src/rabbit_vhost_msg_store.erl +++ b/src/rabbit_vhost_msg_store.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost_msg_store). diff --git a/src/rabbit_vhost_process.erl b/src/rabbit_vhost_process.erl index 487308c25d..8fabaf25b5 100644 --- a/src/rabbit_vhost_process.erl +++ b/src/rabbit_vhost_process.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% %% This module implements a vhost identity process. diff --git a/src/rabbit_vhost_sup.erl b/src/rabbit_vhost_sup.erl index 82899f8236..07df522f4f 100644 --- a/src/rabbit_vhost_sup.erl +++ b/src/rabbit_vhost_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost_sup). diff --git a/src/rabbit_vhost_sup_sup.erl b/src/rabbit_vhost_sup_sup.erl index 19b86cb53c..37a060ff2e 100644 --- a/src/rabbit_vhost_sup_sup.erl +++ b/src/rabbit_vhost_sup_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost_sup_sup). diff --git a/src/rabbit_vhost_sup_wrapper.erl b/src/rabbit_vhost_sup_wrapper.erl index e98b1a45ae..013f793d38 100644 --- a/src/rabbit_vhost_sup_wrapper.erl +++ b/src/rabbit_vhost_sup_wrapper.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% %% This module is a wrapper around vhost supervisor to diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index e495ab8677..1b11017076 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vm). diff --git a/src/supervised_lifecycle.erl b/src/supervised_lifecycle.erl index 3e1918d060..82f6728f17 100644 --- a/src/supervised_lifecycle.erl +++ b/src/supervised_lifecycle.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% %% Invoke callbacks on startup and termination. diff --git a/src/tcp_listener.erl b/src/tcp_listener.erl index 7c2f4a4934..d6c615e3b6 100644 --- a/src/tcp_listener.erl +++ b/src/tcp_listener.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(tcp_listener). diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl index 4ac80b13b6..074a4e4d6a 100644 --- a/src/tcp_listener_sup.erl +++ b/src/tcp_listener_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(tcp_listener_sup). diff --git a/src/term_to_binary_compat.erl b/src/term_to_binary_compat.erl index b5e8f72bd4..7aa4e1471c 100644 --- a/src/term_to_binary_compat.erl +++ b/src/term_to_binary_compat.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% -module(term_to_binary_compat). diff --git a/test/backing_queue_SUITE.erl b/test/backing_queue_SUITE.erl index 94cbd48e8c..5864c387c5 100644 --- a/test/backing_queue_SUITE.erl +++ b/test/backing_queue_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(backing_queue_SUITE). diff --git a/test/channel_interceptor_SUITE.erl b/test/channel_interceptor_SUITE.erl index 4081086f4f..e2711fda86 100644 --- a/test/channel_interceptor_SUITE.erl +++ b/test/channel_interceptor_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(channel_interceptor_SUITE). diff --git a/test/channel_operation_timeout_SUITE.erl b/test/channel_operation_timeout_SUITE.erl index 7b41b9c225..9bfa0ae07a 100644 --- a/test/channel_operation_timeout_SUITE.erl +++ b/test/channel_operation_timeout_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(channel_operation_timeout_SUITE). diff --git a/test/channel_operation_timeout_test_queue.erl b/test/channel_operation_timeout_test_queue.erl index 59de0cb5c7..d414072e2c 100644 --- a/test/channel_operation_timeout_test_queue.erl +++ b/test/channel_operation_timeout_test_queue.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(channel_operation_timeout_test_queue). diff --git a/test/cluster_SUITE.erl b/test/cluster_SUITE.erl index 62928aae9f..c52dc9ef64 100644 --- a/test/cluster_SUITE.erl +++ b/test/cluster_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(cluster_SUITE). diff --git a/test/cluster_formation_locking_SUITE.erl b/test/cluster_formation_locking_SUITE.erl index 25b2df308c..176113c496 100644 --- a/test/cluster_formation_locking_SUITE.erl +++ b/test/cluster_formation_locking_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(cluster_formation_locking_SUITE). @@ -38,13 +38,13 @@ groups() -> init_per_testcase(Testcase, Config) when Testcase == init_with_lock_exits_after_errors; Testcase == init_with_lock_not_supported; Testcase == init_with_lock_supported -> - application:set_env(rabbit, cluster_formation, + application:set_env(rabbit, cluster_formation, [{peer_discover_backend, peer_discover_classic_config}, {lock_acquisition_failure_mode, fail}]), ok = meck:new(rabbit_peer_discovery_classic_config, [passthrough]), Config; init_per_testcase(init_with_lock_ignore_after_errors, Config) -> - application:set_env(rabbit, cluster_formation, + application:set_env(rabbit, cluster_formation, [{peer_discover_backend, peer_discover_classic_config}, {lock_acquisition_failure_mode, ignore}]), ok = meck:new(rabbit_peer_discovery_classic_config, [passthrough]), @@ -52,7 +52,7 @@ init_per_testcase(init_with_lock_ignore_after_errors, Config) -> end_per_testcase(_, _) -> meck:unload(), - application:unset_env(rabbit, cluster_formation). + application:unset_env(rabbit, cluster_formation). init_with_lock_exits_after_errors(_Config) -> meck:expect(rabbit_peer_discovery_classic_config, lock, fun(_) -> {error, "test error"} end), diff --git a/test/cluster_rename_SUITE.erl b/test/cluster_rename_SUITE.erl index dd8147e509..a7743a8891 100644 --- a/test/cluster_rename_SUITE.erl +++ b/test/cluster_rename_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(cluster_rename_SUITE). diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl index 54f4bafbfd..120257feb9 100644 --- a/test/clustering_management_SUITE.erl +++ b/test/clustering_management_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(clustering_management_SUITE). diff --git a/test/config_schema_SUITE.erl b/test/config_schema_SUITE.erl index 4c143cd1aa..80363130d8 100644 --- a/test/config_schema_SUITE.erl +++ b/test/config_schema_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(config_schema_SUITE). @@ -61,4 +61,3 @@ run_snippets(Config) -> run_snippets1(Config) -> rabbit_ct_config_schema:run_snippets(Config). - diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index a7a06aaadf..0cd274b757 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -1,56 +1,24 @@ [{internal_auth_backend, "auth_backends.1 = internal", - [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]}], []}, {ldap_auth_backend, "auth_backends.1 = ldap", - [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]}], []}, {multiple_auth_backends, "auth_backends.1 = ldap auth_backends.2 = internal", [{rabbit, [{auth_backends, - [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]}], []}, {full_name_auth_backend, "auth_backends.1 = ldap # uses module name instead of a short alias, \"http\" auth_backends.2 = rabbit_auth_backend_http", [{rabbit, - [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]}], []}, {third_party_auth_backend, "auth_backends.1.authn = internal @@ -58,30 +26,14 @@ auth_backends.2 = rabbit_auth_backend_http", auth_backends.1.authz = rabbit_auth_backend_ip_range", [{rabbit, [{auth_backends, - [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]}], []}, {authn_authz_backend, "auth_backends.1.authn = ldap auth_backends.1.authz = internal", [{rabbit, [{auth_backends, - [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]}], []}, {authn_authz_multiple_backends, "auth_backends.1.authn = ldap @@ -90,29 +42,13 @@ auth_backends.2 = internal", [{rabbit, [{auth_backends, [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}, - rabbit_auth_backend_internal]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + rabbit_auth_backend_internal]}]}], []}, {authn_backend_only, "auth_backends.1.authn = ldap", [{rabbit, [{auth_backends, - [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]}], []}, {ssl_options, "ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem @@ -126,50 +62,15 @@ ssl_options.fail_if_no_peer_cert = true", {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, {verify,verify_peer}, - {fail_if_no_peer_cert,true}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {fail_if_no_peer_cert,true}]}]}], []}, {tcp_listener, "listeners.tcp.default = 5673", - [{rabbit,[{tcp_listeners,[5673]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], - []}, + [{rabbit,[{tcp_listeners,[5673]}]}],[]}, {ssl_listener, - "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], - []}, + "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]}],[]}, {num_acceptors, - "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], - []}, + "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]}],[]}, {default_user_settings, "default_user = guest default_pass = guest @@ -181,15 +82,7 @@ default_permissions.write = .*", [{default_user,<<"guest">>}, {default_pass,<<"guest">>}, {default_user_tags,[administrator]}, - {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]}], []}, {cluster_formation, "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config @@ -200,15 +93,7 @@ cluster_formation.node_type = disc", [{cluster_formation, [{peer_discovery_backend,rabbit_peer_discovery_classic_config}, {node_type,disc}]}, - {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}], []}, {cluster_formation_disK, "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config @@ -219,248 +104,92 @@ cluster_formation.node_type = disc", [{cluster_formation, [{peer_discovery_backend,rabbit_peer_discovery_classic_config}, {node_type,disc}]}, - {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}], []}, {cluster_formation_ram_ignored, - "cluster_formation.node_type = ram",[ - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}],[]}, + "cluster_formation.node_type = ram",[],[]}, {tcp_listen_options, "tcp_listen_options.backlog = 128 tcp_listen_options.nodelay = true tcp_listen_options.exit_on_close = false", [{rabbit, [{tcp_listen_options, - [{backlog,128},{nodelay,true},{exit_on_close,false}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{backlog,128},{nodelay,true},{exit_on_close,false}]}]}], []}, {vm_memory_watermark_absolute, "vm_memory_high_watermark.absolute = 1073741824", - [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}], []}, {vm_memory_watermark_absolute_units, "vm_memory_high_watermark.absolute = 1024MB", - [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]}], []}, {vm_memory_watermark_paging_ratio, "vm_memory_high_watermark_paging_ratio = 0.75 vm_memory_high_watermark.relative = 0.4", [{rabbit, [{vm_memory_high_watermark_paging_ratio,0.75}, - {vm_memory_high_watermark,0.4}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {vm_memory_high_watermark,0.4}]}], []}, {memory_monitor_interval, "memory_monitor_interval = 5000", [{rabbit, - [{memory_monitor_interval, 5000}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{memory_monitor_interval, 5000}]}], []}, {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = rss", [{rabbit, - [{vm_memory_calculation_strategy, rss}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{vm_memory_calculation_strategy, rss}]}], []}, {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = erlang", [{rabbit, - [{vm_memory_calculation_strategy, erlang}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{vm_memory_calculation_strategy, erlang}]}], []}, {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = allocated", [{rabbit, - [{vm_memory_calculation_strategy, allocated}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{vm_memory_calculation_strategy, allocated}]}], []}, {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = legacy", [{rabbit, - [{vm_memory_calculation_strategy, legacy}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{vm_memory_calculation_strategy, legacy}]}], []}, {total_memory_available_override_value, "total_memory_available_override_value = 1000000000", - [{rabbit,[{total_memory_available_override_value, 1000000000}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{total_memory_available_override_value, 1000000000}]}], []}, {total_memory_available_override_value_units, "total_memory_available_override_value = 1024MB", - [{rabbit,[{total_memory_available_override_value, "1024MB"}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{total_memory_available_override_value, "1024MB"}]}], []}, {connection_max, "connection_max = 999", - [{rabbit,[{connection_max, 999}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{connection_max, 999}]}], []}, {connection_max, "connection_max = infinity", - [{rabbit,[{connection_max, infinity}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{connection_max, infinity}]}], []}, {channel_max, "channel_max = 16", - [{rabbit,[{channel_max, 16}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{channel_max, 16}]}], + []}, + {max_message_size, + "max_message_size = 131072", + [{rabbit, [{max_message_size, 131072}]}], []}, {listeners_tcp_ip, "listeners.tcp.1 = 192.168.1.99:5672", - [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}], []}, {listeners_tcp_ip_multiple, "listeners.tcp.1 = 127.0.0.1:5672 listeners.tcp.2 = ::1:5672", - [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]}], []}, {listeners_tcp_ip_all,"listeners.tcp.1 = :::5672", - [{rabbit,[{tcp_listeners,[{"::",5672}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listeners,[{"::",5672}]}]}], []}, {listeners_tcp_ipv6, "listeners.tcp.1 = fe80::2acf:e9ff:fe17:f97b:5672", - [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]}], []}, {tcp_options_sndbuf, "tcp_listen_options.backlog = 128 @@ -469,15 +198,7 @@ tcp_listen_options.exit_on_close = false", tcp_listen_options.recbuf = 196608", [{rabbit, [{tcp_listen_options, - [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]}], []}, {tcp_listen_options_nodelay_with_kernel, "tcp_listen_options.backlog = 4096 @@ -488,40 +209,16 @@ tcp_listen_options.exit_on_close = false", [{kernel, [{inet_default_connect_options,[{nodelay,true}]}, {inet_default_listen_options,[{nodelay,true}]}]}, - {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}], []}, {tcp_listen_options_nodelay, "tcp_listen_options.backlog = 4096 tcp_listen_options.nodelay = true", - [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}], []}, {ssl_handshake_timeout, "ssl_handshake_timeout = 10000", - [{rabbit,[{ssl_handshake_timeout,10000}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{ssl_handshake_timeout,10000}]}], []}, {cluster_partition_handling_pause_if_all_down, "cluster_partition_handling = pause_if_all_down @@ -534,39 +231,15 @@ tcp_listen_options.exit_on_close = false", cluster_partition_handling.pause_if_all_down.nodes.2 = rabbit@myhost2", [{rabbit, [{cluster_partition_handling, - {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]}], []}, {cluster_partition_handling_autoheal, "cluster_partition_handling = autoheal", - [{rabbit,[{cluster_partition_handling,autoheal}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{cluster_partition_handling,autoheal}]}], []}, {password_hashing, "password_hashing_module = rabbit_password_hashing_sha512", - [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]}], []}, {ssl_options_verify_peer, "listeners.ssl.1 = 5671 @@ -582,15 +255,7 @@ tcp_listen_options.exit_on_close = false", {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, {verify,verify_peer}, - {fail_if_no_peer_cert,false}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {fail_if_no_peer_cert,false}]}]}], []}, {ssl_options_password, "listeners.ssl.1 = 5671 @@ -604,15 +269,7 @@ tcp_listen_options.exit_on_close = false", [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, - {password,"t0p$3kRe7"}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {password,"t0p$3kRe7"}]}]}], []}, {ssl_options_tls_ver_old, "listeners.ssl.1 = 5671 @@ -630,15 +287,7 @@ tcp_listen_options.exit_on_close = false", [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, - {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]}], []}, {ssl_options_tls_ver_new, "listeners.ssl.1 = 5671 @@ -655,15 +304,7 @@ tcp_listen_options.exit_on_close = false", [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, - {versions,['tlsv1.2','tlsv1.1']}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {versions,['tlsv1.2','tlsv1.1']}]}]}], []}, {ssl_options_ciphers, @@ -701,15 +342,7 @@ tcp_listen_options.exit_on_close = false", ]}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, - {versions,['tlsv1.2','tlsv1.1']}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {versions,['tlsv1.2','tlsv1.1']}]}]}], []}, {ssl_options_allow_poodle, @@ -728,15 +361,7 @@ tcp_listen_options.exit_on_close = false", {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, {verify,verify_peer}, - {fail_if_no_peer_cert,false}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {fail_if_no_peer_cert,false}]}]}], []}, {ssl_options_depth, "listeners.ssl.1 = 5671 @@ -754,15 +379,7 @@ tcp_listen_options.exit_on_close = false", {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}, {depth,2}, {verify,verify_peer}, - {fail_if_no_peer_cert,false}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {fail_if_no_peer_cert,false}]}]}], []}, {ssl_options_honor_cipher_order, "listeners.ssl.1 = 5671 @@ -782,15 +399,7 @@ tcp_listen_options.exit_on_close = false", {depth,2}, {verify,verify_peer}, {fail_if_no_peer_cert, false}, - {honor_cipher_order, true}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {honor_cipher_order, true}]}]}], []}, {ssl_options_honor_ecc_order, "listeners.ssl.1 = 5671 @@ -810,77 +419,29 @@ tcp_listen_options.exit_on_close = false", {depth,2}, {verify,verify_peer}, {fail_if_no_peer_cert, false}, - {honor_ecc_order, true}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {honor_ecc_order, true}]}]}], []}, {ssl_cert_login_from, "ssl_cert_login_from = common_name", - [{rabbit,[{ssl_cert_login_from,common_name}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{ssl_cert_login_from,common_name}]}], []}, {tcp_listen_options_linger_on, "tcp_listen_options.linger.on = true tcp_listen_options.linger.timeout = 100", - [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]}], []}, {tcp_listen_options_linger_off, "tcp_listen_options.linger.on = false tcp_listen_options.linger.timeout = 100", - [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}], []}, {tcp_listen_options_linger_on_notimeout, "tcp_listen_options.linger.on = true", - [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]}], []}, {tcp_listen_options_linger_timeout, "tcp_listen_options.linger.timeout = 100", - [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}], []}, {cluster_formation_randomized_startup_delay_both_values, @@ -888,45 +449,21 @@ tcp_listen_options.exit_on_close = false", cluster_formation.randomized_startup_delay_range.max = 30", [{rabbit, [{cluster_formation, [ {randomized_startup_delay_range, {10, 30}} - ]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}]}], []}, {cluster_formation_randomized_startup_delay_min_only, "cluster_formation.randomized_startup_delay_range.min = 10", [{rabbit, [{cluster_formation, [ {randomized_startup_delay_range, {10, 60}} - ]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}]}], []}, {cluster_formation_randomized_startup_delay_max_only, "cluster_formation.randomized_startup_delay_range.max = 30", [{rabbit, [{cluster_formation, [ {randomized_startup_delay_range, {5, 30}} - ]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}]}], []}, {cluster_formation_dns, @@ -937,15 +474,7 @@ tcp_listen_options.exit_on_close = false", [{cluster_formation, [{peer_discovery_dns,[{hostname,<<"192.168.0.2.xip.io">>}]}, {peer_discovery_backend,rabbit_peer_discovery_dns}, - {node_type,disc}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {node_type,disc}]}]}], []}, {cluster_formation_classic, "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config @@ -953,15 +482,7 @@ tcp_listen_options.exit_on_close = false", [{rabbit, [{cluster_formation, [{peer_discovery_backend,rabbit_peer_discovery_classic_config}, - {node_type,disc}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {node_type,disc}]}]}], []}, {cluster_formation_classic_ram, "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config @@ -969,43 +490,19 @@ tcp_listen_options.exit_on_close = false", [{rabbit, [{cluster_formation, [{peer_discovery_backend,rabbit_peer_discovery_classic_config}, - {node_type,ram}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {node_type,ram}]}]}], []}, {background_gc_enabled, "background_gc_enabled = true background_gc_target_interval = 30000", [{rabbit, - [{background_gc_enabled,true},{background_gc_target_interval,30000}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{background_gc_enabled,true},{background_gc_target_interval,30000}]}], []}, {background_gc_disabled, "background_gc_enabled = false background_gc_target_interval = 30000", [{rabbit, - [{background_gc_enabled,false},{background_gc_target_interval,30000}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{background_gc_enabled,false},{background_gc_target_interval,30000}]}], []}, {credential_validator_length, "credential_validator.validation_backend = rabbit_credential_validator_min_password_length @@ -1014,15 +511,7 @@ credential_validator.min_length = 10", [{credential_validator, [{validation_backend, rabbit_credential_validator_min_password_length}, - {min_length,10}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {min_length,10}]}]}], []}, {credential_validator_regexp, "credential_validator.validation_backend = rabbit_credential_validator_password_regexp @@ -1030,198 +519,78 @@ credential_validator.regexp = ^abc\\d+", [{rabbit, [{credential_validator, [{validation_backend,rabbit_credential_validator_password_regexp}, - {regexp,"^abc\\d+"}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {regexp,"^abc\\d+"}]}]}], []}, {proxy_protocol_on, "proxy_protocol = true", - [{rabbit,[{proxy_protocol,true}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}],[]}, + [{rabbit,[{proxy_protocol,true}]}],[]}, {proxy_protocol_off, "proxy_protocol = false", - [{rabbit,[{proxy_protocol,false}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}],[]}, + [{rabbit,[{proxy_protocol,false}]}],[]}, {log_debug_file, "log.file.level = debug", - [{rabbit,[{log, [{file, [{level, debug}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{file, [{level, debug}]}]}]}], []}, {log_debug_console, "log.console = true log.console.level = debug", - [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]}], []}, {log_debug_exchange, "log.exchange = true log.exchange.level = debug", - [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]}], []}, {log_debug_syslog, "log.syslog = true log.syslog.level = debug", - [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]}], []}, {log_file_name, "log.file = file_name", - [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]}], []}, {log_file_disabled, "log.file = false", - [{rabbit,[{log, [{file, [{file, false}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + [{rabbit,[{log, [{file, [{file, false}]}]}]}], []}, {log_category_level, "log.connection.level = debug log.channel.level = error", [{rabbit,[{log, [{categories, [{connection, [{level, debug}]}, - {channel, [{level, error}]}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {channel, [{level, error}]}]}]}]}], []}, {log_category_file, "log.connection.file = file_name_connection log.channel.file = file_name_channel", [{rabbit,[{log, [{categories, [{connection, [{file, "file_name_connection"}]}, - {channel, [{file, "file_name_channel"}]}]}]}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {channel, [{file, "file_name_channel"}]}]}]}]}], []}, {delegate_count, "delegate_count = 64", [{rabbit, [ {delegate_count, 64} - ]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}], []}, {kernel_net_ticktime, "net_ticktime = 20", [{kernel, [ {net_ticktime, 20} - ]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}], []}, {kernel_inet_dist_listen_min, "inet_dist_listen_min = 16000", [{kernel, [ {inet_dist_listen_min, 16000} - ]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}], []}, {kernel_inet_dist_listen_max, "inet_dist_listen_max = 16100", [{kernel, [ {inet_dist_listen_max, 16100} - ]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + ]}], []}, {log_syslog_settings, @@ -1237,15 +606,7 @@ credential_validator.regexp = ^abc\\d+", {facility, user}, {multiline_mode, true}, {dest_host, "10.10.10.10"}, - {dest_port, 123}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]} + {dest_port, 123}]} ], []}, {log_syslog_tcp, @@ -1256,15 +617,7 @@ credential_validator.regexp = ^abc\\d+", [ {rabbit,[{log, [{syslog, [{enabled, true}]}]}]}, {syslog, [{protocol, {rfc5424, tcp}}, - {dest_host, "syslog.my-network.com"}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]} + {dest_host, "syslog.my-network.com"}]} ], []}, {log_syslog_udp_default, @@ -1272,15 +625,7 @@ credential_validator.regexp = ^abc\\d+", log.syslog.protocol = rfc3164", [ {rabbit,[{log, [{syslog, [{enabled, true}]}]}]}, - {syslog, [{protocol, {rfc3164, udp}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]} + {syslog, [{protocol, {rfc3164, udp}}]} ], []}, {log_syslog_tls, @@ -1297,14 +642,6 @@ credential_validator.regexp = ^abc\\d+", {fail_if_no_peer_cert,false}, {cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"}, {certfile,"test/config_schema_SUITE_data/certs/cert.pem"}, - {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]}, - {sysmon_handler, - [{busy_dist_port,true}, - {busy_port,true}, - {gc_ms_limit,0}, - {heap_word_limit,20055500}, - {port_limit,2}, - {process_limit,30}, - {schedule_ms_limit,0}]}], + {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]}], []} ]. diff --git a/test/crashing_queues_SUITE.erl b/test/crashing_queues_SUITE.erl index fa0a695173..2d91083abc 100644 --- a/test/crashing_queues_SUITE.erl +++ b/test/crashing_queues_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(crashing_queues_SUITE). diff --git a/test/credential_validation_SUITE.erl b/test/credential_validation_SUITE.erl index 4f241197fc..0c499b2e86 100644 --- a/test/credential_validation_SUITE.erl +++ b/test/credential_validation_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(credential_validation_SUITE). @@ -272,4 +272,3 @@ regexp_that_requires_length_of_at_most(N) when is_integer(N) -> validator_backend(Config) -> rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_credential_validation, backend, []). - diff --git a/test/disconnect_detected_during_alarm_SUITE.erl b/test/disconnect_detected_during_alarm_SUITE.erl index 42e221fb0f..4776c9e179 100644 --- a/test/disconnect_detected_during_alarm_SUITE.erl +++ b/test/disconnect_detected_during_alarm_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(disconnect_detected_during_alarm_SUITE). diff --git a/test/dummy_event_receiver.erl b/test/dummy_event_receiver.erl index 75db3678ce..0720db73a0 100644 --- a/test/dummy_event_receiver.erl +++ b/test/dummy_event_receiver.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(dummy_event_receiver). diff --git a/test/dummy_runtime_parameters.erl b/test/dummy_runtime_parameters.erl index 0bf4b82d86..a314739d21 100644 --- a/test/dummy_runtime_parameters.erl +++ b/test/dummy_runtime_parameters.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(dummy_runtime_parameters). diff --git a/test/dummy_supervisor2.erl b/test/dummy_supervisor2.erl index 9ca3f6329c..7f0588ec30 100644 --- a/test/dummy_supervisor2.erl +++ b/test/dummy_supervisor2.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(dummy_supervisor2). diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl index 1d455bb290..e41c07a888 100644 --- a/test/dynamic_ha_SUITE.erl +++ b/test/dynamic_ha_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(dynamic_ha_SUITE). diff --git a/test/eager_sync_SUITE.erl b/test/eager_sync_SUITE.erl index 7f28ea436d..f6c9002c51 100644 --- a/test/eager_sync_SUITE.erl +++ b/test/eager_sync_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(eager_sync_SUITE). diff --git a/test/gm_SUITE.erl b/test/gm_SUITE.erl index df73d8ac27..6236717196 100644 --- a/test/gm_SUITE.erl +++ b/test/gm_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(gm_SUITE). diff --git a/test/health_check_SUITE.erl b/test/health_check_SUITE.erl index 13373d79d4..1e5552e0e5 100644 --- a/test/health_check_SUITE.erl +++ b/test/health_check_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(health_check_SUITE). diff --git a/test/lazy_queue_SUITE.erl b/test/lazy_queue_SUITE.erl index f6de560832..8dfc0d62ad 100644 --- a/test/lazy_queue_SUITE.erl +++ b/test/lazy_queue_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(lazy_queue_SUITE). diff --git a/test/list_consumers_sanity_check_SUITE.erl b/test/list_consumers_sanity_check_SUITE.erl index 3fa02b1de6..7d9444255b 100644 --- a/test/list_consumers_sanity_check_SUITE.erl +++ b/test/list_consumers_sanity_check_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(list_consumers_sanity_check_SUITE). diff --git a/test/list_queues_online_and_offline_SUITE.erl b/test/list_queues_online_and_offline_SUITE.erl index 4b56012a26..2d3823be0e 100644 --- a/test/list_queues_online_and_offline_SUITE.erl +++ b/test/list_queues_online_and_offline_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(list_queues_online_and_offline_SUITE). diff --git a/test/many_node_ha_SUITE.erl b/test/many_node_ha_SUITE.erl index c5c0382dc7..a6def781fa 100644 --- a/test/many_node_ha_SUITE.erl +++ b/test/many_node_ha_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(many_node_ha_SUITE). @@ -114,4 +114,3 @@ kill_intermediate(Config) -> rabbit_ha_test_producer:await_response(ProducerPid), rabbit_ha_test_consumer:await_response(ConsumerPid), ok. - diff --git a/test/metrics_SUITE.erl b/test/metrics_SUITE.erl index a66e9cec3c..44368b643d 100644 --- a/test/metrics_SUITE.erl +++ b/test/metrics_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(metrics_SUITE). -compile(export_all). diff --git a/test/mirrored_supervisor_SUITE.erl b/test/mirrored_supervisor_SUITE.erl index 5ed17c90bb..d3cc080eeb 100644 --- a/test/mirrored_supervisor_SUITE.erl +++ b/test/mirrored_supervisor_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(mirrored_supervisor_SUITE). @@ -332,4 +332,3 @@ init({fake_strategy_for_ignore, _ChildSpecs}) -> init({Strategy, ChildSpecs}) -> {ok, {{Strategy, 0, 1}, ChildSpecs}}. - diff --git a/test/mirrored_supervisor_SUITE_gs.erl b/test/mirrored_supervisor_SUITE_gs.erl index 867754b4a2..5f65758416 100644 --- a/test/mirrored_supervisor_SUITE_gs.erl +++ b/test/mirrored_supervisor_SUITE_gs.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(mirrored_supervisor_SUITE_gs). diff --git a/test/msg_store_SUITE.erl b/test/msg_store_SUITE.erl index 4eaa535a57..f384ee12ef 100644 --- a/test/msg_store_SUITE.erl +++ b/test/msg_store_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(msg_store_SUITE). diff --git a/test/partitions_SUITE.erl b/test/partitions_SUITE.erl index b09d05b550..ff8f7b4289 100644 --- a/test/partitions_SUITE.erl +++ b/test/partitions_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(partitions_SUITE). diff --git a/test/peer_discovery_dns_SUITE.erl b/test/peer_discovery_dns_SUITE.erl index 7deb38ba97..1690dde64c 100644 --- a/test/peer_discovery_dns_SUITE.erl +++ b/test/peer_discovery_dns_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(peer_discovery_dns_SUITE). diff --git a/test/per_user_connection_tracking_SUITE.erl b/test/per_user_connection_tracking_SUITE.erl index 7f93aef1ac..19650607ad 100644 --- a/test/per_user_connection_tracking_SUITE.erl +++ b/test/per_user_connection_tracking_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(per_user_connection_tracking_SUITE). @@ -116,7 +116,7 @@ single_node_list_of_user(Config) -> Username2 = <<"guest2">>, Vhost = proplists:get_value(rmq_vhost, Config), - + rabbit_ct_broker_helpers:add_user(Config, Username2), rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost), @@ -142,7 +142,7 @@ single_node_list_of_user(Config) -> [Username, Username] = lists:map(fun (#tracked_connection{username = U}) -> U end, connections_in(Config, Username)), - + close_connections([Conn2, Conn3, Conn5]), rabbit_ct_broker_helpers:delete_user(Config, Username2), ?assertEqual(0, length(all_connections(Config))). @@ -152,7 +152,7 @@ single_node_user_deletion_forces_connection_closure(Config) -> Username2 = <<"guest2">>, Vhost = proplists:get_value(rmq_vhost, Config), - + rabbit_ct_broker_helpers:add_user(Config, Username2), rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost), @@ -177,7 +177,7 @@ cluster_user_deletion_forces_connection_closure(Config) -> Username2 = <<"guest2">>, Vhost = proplists:get_value(rmq_vhost, Config), - + rabbit_ct_broker_helpers:add_user(Config, Username2), rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost), diff --git a/test/per_vhost_connection_limit_SUITE.erl b/test/per_vhost_connection_limit_SUITE.erl index 68deec12cb..db1b8d859d 100644 --- a/test/per_vhost_connection_limit_SUITE.erl +++ b/test/per_vhost_connection_limit_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(per_vhost_connection_limit_SUITE). diff --git a/test/per_vhost_connection_limit_partitions_SUITE.erl b/test/per_vhost_connection_limit_partitions_SUITE.erl index 20adf704a0..610ce33bba 100644 --- a/test/per_vhost_connection_limit_partitions_SUITE.erl +++ b/test/per_vhost_connection_limit_partitions_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(per_vhost_connection_limit_partitions_SUITE). diff --git a/test/per_vhost_msg_store_SUITE.erl b/test/per_vhost_msg_store_SUITE.erl index 4d88c84b7e..94c434deee 100644 --- a/test/per_vhost_msg_store_SUITE.erl +++ b/test/per_vhost_msg_store_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(per_vhost_msg_store_SUITE). diff --git a/test/per_vhost_queue_limit_SUITE.erl b/test/per_vhost_queue_limit_SUITE.erl index 1c6bea08dd..80de41797f 100644 --- a/test/per_vhost_queue_limit_SUITE.erl +++ b/test/per_vhost_queue_limit_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(per_vhost_queue_limit_SUITE). diff --git a/test/plugin_versioning_SUITE.erl b/test/plugin_versioning_SUITE.erl index e184aeac64..d8adc85071 100644 --- a/test/plugin_versioning_SUITE.erl +++ b/test/plugin_versioning_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(plugin_versioning_SUITE). diff --git a/test/policy_SUITE.erl b/test/policy_SUITE.erl index 7cf3427db0..22ef8175f9 100644 --- a/test/policy_SUITE.erl +++ b/test/policy_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(policy_SUITE). @@ -79,7 +79,7 @@ policy_ttl(Config) -> Q = <<"policy_ttl-queue">>, rabbit_ct_broker_helpers:set_policy(Config, 0, <<"ttl-policy">>, <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 20}]), - + declare(Ch, Q), publish(Ch, Q, lists:seq(1, 20)), timer:sleep(50), @@ -100,7 +100,7 @@ operator_policy_ttl(Config) -> <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 100000}]), rabbit_ct_broker_helpers:set_operator_policy(Config, 0, <<"ttl-policy-op">>, <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 1}]), - + declare(Ch, Q), publish(Ch, Q, lists:seq(1, 50)), timer:sleep(50), diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl index 33906ee70b..9db866e3c6 100644 --- a/test/priority_queue_SUITE.erl +++ b/test/priority_queue_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(priority_queue_SUITE). diff --git a/test/priority_queue_recovery_SUITE.erl b/test/priority_queue_recovery_SUITE.erl index 9e2ffbd3fe..20f0082aab 100644 --- a/test/priority_queue_recovery_SUITE.erl +++ b/test/priority_queue_recovery_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(priority_queue_recovery_SUITE). diff --git a/test/proxy_protocol_SUITE.erl b/test/proxy_protocol_SUITE.erl index 84b94d72a8..787ff7446c 100644 --- a/test/proxy_protocol_SUITE.erl +++ b/test/proxy_protocol_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% -module(proxy_protocol_SUITE). diff --git a/test/queue_master_location_SUITE.erl b/test/queue_master_location_SUITE.erl index 94101567f6..d4c8da2bcb 100644 --- a/test/queue_master_location_SUITE.erl +++ b/test/queue_master_location_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(queue_master_location_SUITE). diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index b453f5cdb3..0beecf6c79 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% -module(quorum_queue_SUITE). @@ -1141,7 +1141,7 @@ test_dead_lettering(PolicySet, Config, Ch, Servers, RaName, Source, Destination) wait_for_messages_pending_ack(Servers, RaName, 0), wait_for_messages(Config, [[Destination, <<"0">>, <<"0">>, <<"0">>]]), DeliveryTag = consume(Ch, Source, false), - wait_for_messages_ready(Servers, RaName, 0), + wait_for_messages_ready(Servers, RaName, 0), wait_for_messages_pending_ack(Servers, RaName, 1), wait_for_messages(Config, [[Destination, <<"0">>, <<"0">>, <<"0">>]]), amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag, @@ -1829,7 +1829,7 @@ reconnect_consumer_and_publish(Config) -> multiple = false}), wait_for_messages_ready(Servers, RaName, 0), wait_for_messages_pending_ack(Servers, RaName, 1) - end, + end, receive {#'basic.deliver'{delivery_tag = DeliveryTag2, redelivered = true}, _} -> @@ -2291,4 +2291,3 @@ get_message_bytes(Leader, QRes) -> _ -> [] end. - diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl index 47d47290a4..5bbc95274f 100644 --- a/test/rabbit_core_metrics_gc_SUITE.erl +++ b/test/rabbit_core_metrics_gc_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_core_metrics_gc_SUITE). diff --git a/test/rabbit_dummy_protocol_connection_info.erl b/test/rabbit_dummy_protocol_connection_info.erl index 3da963e057..759fef868d 100644 --- a/test/rabbit_dummy_protocol_connection_info.erl +++ b/test/rabbit_dummy_protocol_connection_info.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% %% Dummy module to test rabbit_direct:extract_extra_auth_props diff --git a/test/rabbit_ha_test_consumer.erl b/test/rabbit_ha_test_consumer.erl index f0ddd9f839..8d61903308 100644 --- a/test/rabbit_ha_test_consumer.erl +++ b/test/rabbit_ha_test_consumer.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_ha_test_consumer). diff --git a/test/rabbit_ha_test_producer.erl b/test/rabbit_ha_test_producer.erl index b6c301cd0c..538d2213a2 100644 --- a/test/rabbit_ha_test_producer.erl +++ b/test/rabbit_ha_test_producer.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_ha_test_producer). diff --git a/test/rabbitmqctl_integration_SUITE.erl b/test/rabbitmqctl_integration_SUITE.erl index a5d3a0fd03..87d076f694 100644 --- a/test/rabbitmqctl_integration_SUITE.erl +++ b/test/rabbitmqctl_integration_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbitmqctl_integration_SUITE). diff --git a/test/rabbitmqctl_shutdown_SUITE.erl b/test/rabbitmqctl_shutdown_SUITE.erl index 25cc2fdef8..0debfde2b6 100644 --- a/test/rabbitmqctl_shutdown_SUITE.erl +++ b/test/rabbitmqctl_shutdown_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% -module(rabbitmqctl_shutdown_SUITE). diff --git a/test/simple_ha_SUITE.erl b/test/simple_ha_SUITE.erl index 41b6ec7a94..60c736747e 100644 --- a/test/simple_ha_SUITE.erl +++ b/test/simple_ha_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(simple_ha_SUITE). diff --git a/test/single_active_consumer_SUITE.erl b/test/single_active_consumer_SUITE.erl index 945229e372..25261042b2 100644 --- a/test/single_active_consumer_SUITE.erl +++ b/test/single_active_consumer_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% -module(single_active_consumer_SUITE). diff --git a/test/sup_delayed_restart_SUITE.erl b/test/sup_delayed_restart_SUITE.erl index 0dffe33068..5905419d91 100644 --- a/test/sup_delayed_restart_SUITE.erl +++ b/test/sup_delayed_restart_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(sup_delayed_restart_SUITE). diff --git a/test/sync_detection_SUITE.erl b/test/sync_detection_SUITE.erl index c606e050dd..f575d72d4d 100644 --- a/test/sync_detection_SUITE.erl +++ b/test/sync_detection_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(sync_detection_SUITE). diff --git a/test/temp/rabbitmqadmin.py b/test/temp/rabbitmqadmin.py index 1e7552b92c..eb4ac11219 100755 --- a/test/temp/rabbitmqadmin.py +++ b/test/temp/rabbitmqadmin.py @@ -13,7 +13,7 @@ # The Original Code is RabbitMQ Management Plugin. # # The Initial Developer of the Original Code is GoPivotal, Inc. -# Copyright (c) 2010-2015 Pivotal Software, Inc. All rights reserved. +# Copyright (c) 2010-2019 Pivotal Software, Inc. All rights reserved. import sys if sys.version_info[0] < 2 or sys.version_info[1] < 6: diff --git a/test/term_to_binary_compat_prop_SUITE.erl b/test/term_to_binary_compat_prop_SUITE.erl index ba5069860a..250a7a7bf2 100644 --- a/test/term_to_binary_compat_prop_SUITE.erl +++ b/test/term_to_binary_compat_prop_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2017-2019 Pivotal Software, Inc. All rights reserved. %% diff --git a/test/topic_permission_SUITE.erl b/test/topic_permission_SUITE.erl index c656746432..6db2d988b9 100644 --- a/test/topic_permission_SUITE.erl +++ b/test/topic_permission_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(topic_permission_SUITE). diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl index f74e18afb9..1c3b453c04 100644 --- a/test/unit_SUITE.erl +++ b/test/unit_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(unit_SUITE). diff --git a/test/unit_inbroker_non_parallel_SUITE.erl b/test/unit_inbroker_non_parallel_SUITE.erl index 56d692847f..e3e282f233 100644 --- a/test/unit_inbroker_non_parallel_SUITE.erl +++ b/test/unit_inbroker_non_parallel_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(unit_inbroker_non_parallel_SUITE). diff --git a/test/unit_inbroker_parallel_SUITE.erl b/test/unit_inbroker_parallel_SUITE.erl index 466df684af..0343e7d136 100644 --- a/test/unit_inbroker_parallel_SUITE.erl +++ b/test/unit_inbroker_parallel_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(unit_inbroker_parallel_SUITE). diff --git a/test/unit_log_config_SUITE.erl b/test/unit_log_config_SUITE.erl index b753c4075c..35b073e6fa 100644 --- a/test/unit_log_config_SUITE.erl +++ b/test/unit_log_config_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2016-2019 Pivotal Software, Inc. All rights reserved. %% -module(unit_log_config_SUITE). diff --git a/test/unit_queue_consumers_SUITE.erl b/test/unit_queue_consumers_SUITE.erl index 08d12e7ec5..08b2da4574 100644 --- a/test/unit_queue_consumers_SUITE.erl +++ b/test/unit_queue_consumers_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2018 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2018-2019 Pivotal Software, Inc. All rights reserved. %% -module(unit_queue_consumers_SUITE). @@ -99,4 +99,4 @@ state(Consumers) -> function_for_process() -> receive _ -> ok - end.
\ No newline at end of file + end. diff --git a/test/vhost_SUITE.erl b/test/vhost_SUITE.erl index d339dc43b3..2de5819b54 100644 --- a/test/vhost_SUITE.erl +++ b/test/vhost_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2011-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2011-2019 Pivotal Software, Inc. All rights reserved. %% -module(vhost_SUITE). diff --git a/test/worker_pool_SUITE.erl b/test/worker_pool_SUITE.erl index d15f42c504..8c9c5fa366 100644 --- a/test/worker_pool_SUITE.erl +++ b/test/worker_pool_SUITE.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2019 Pivotal Software, Inc. All rights reserved. %% -module(worker_pool_SUITE). |