Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5b244e7
Fix MoreCreditAfter could larger than InitialCredit
JimmyWang6 Jan 8, 2025
8164875
Fix typo
Jan 10, 2025
e589c42
Change to throw an error when credit_flow_default_credit invalid
Jan 11, 2025
e6954c8
Change to throw an error when credit_flow_default_credit invalid
Jan 11, 2025
2394d42
Fix typo
Jan 11, 2025
0135f62
Fix typo
Jan 11, 2025
3a91e35
build(deps-dev): bump org.assertj:assertj-core
dependabot[bot] Jan 6, 2025
be51545
build(deps-dev): bump org.assertj:assertj-core
dependabot[bot] Jan 6, 2025
e10c85d
build(deps-dev): bump org.assertj:assertj-core
dependabot[bot] Jan 6, 2025
d2dff6c
build(deps): bump com.diffplug.spotless:spotless-maven-plugin
dependabot[bot] Jan 7, 2025
2de80bb
build(deps): bump com.diffplug.spotless:spotless-maven-plugin
dependabot[bot] Jan 7, 2025
b3932af
build(deps): bump com.diffplug.spotless:spotless-maven-plugin
dependabot[bot] Jan 7, 2025
d135bdf
Improve documentation of certain health checks
michaelklishin Jan 7, 2025
998b501
CLI: drop an unused import
michaelklishin Jan 7, 2025
c64f0a1
HTTP API reference: fix a typo
michaelklishin Jan 8, 2025
d749536
HTTP API reference: a follow-up to #13037
michaelklishin Jan 8, 2025
4603d35
rabbitmq.conf.example: suggest Discussions and Discord for questions
michaelklishin Jan 9, 2025
3763c7a
HTTP API reference: updates for 4.0.x
michaelklishin Jan 9, 2025
9cf7404
HTTP API reference: remove duplicate sentences
michaelklishin Jan 9, 2025
7576250
HTTP API reference: remove one more duplicate sentence
michaelklishin Jan 9, 2025
82c93ce
rabbitmq.conf.example: document quorum_queue.property_equivalence.rel…
michaelklishin Jan 9, 2025
9ca47d4
Remove wrong sentence
ansd Jan 10, 2025
e5fe724
rabbitmq.conf.example: a typo #8076
michaelklishin Jan 11, 2025
27e4d4b
HTTP API: make GET /api/aliveness-test a no-op
michaelklishin Jan 11, 2025
3dd3433
Finish off #13046
michaelklishin Jan 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions deps/rabbit/docs/rabbitmq.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
##
## See https://www.rabbitmq.com/docs/documentation for the rest of RabbitMQ documentation.
##
## In case you have questions, please use RabbitMQ community Slack and the rabbitmq-users Google group
## instead of GitHub issues.
## In case you have questions, please use rabbitmq/rabbitmq-server Discussions and the RabbitMQ community Discord server
## for questions.

# ======================================
# Core broker section
Expand Down Expand Up @@ -374,6 +374,22 @@
# tcp_listen_options.sndbuf = 196608
# tcp_listen_options.recbuf = 196608

##
## Queues
##

## If set, the 'x-queue-type' header will be ignored (not compared for equivalence)
## for queue redeclaration. This can simplify upgrades of applications that explicitly
## set 'x-queue-type' to 'classic' for historical reasons but do not set any other
## properties that may conflict or significantly change queue behavior and semantics, such as the 'exclusive' field.
# quorum_queue.property_equivalence.relaxed_checks_on_redeclaration = true

## Changes classic queue storage implementation version.
## In 4.0.x, version 2 is the default and this is a forward compatibility setting,
## that is, it will be useful when a new version is developed.
##
# classic_queue.default_version = 2

##
## Resource Limits & Flow Control
## ==============================
Expand Down
20 changes: 18 additions & 2 deletions deps/rabbit/src/rabbit.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1751,10 +1751,26 @@ persist_static_configuration() ->
[classic_queue_index_v2_segment_entry_count,
classic_queue_store_v2_max_cache_size,
classic_queue_store_v2_check_crc32,
incoming_message_interceptors,
credit_flow_default_credit
incoming_message_interceptors
]),

%% Disallow the following two cases:
%% 1. Negative values
%% 2. MoreCreditAfter greater than InitialCredit
CreditFlowDefaultCredit = case application:get_env(?MODULE, credit_flow_default_credit) of
{ok, {InitialCredit, MoreCreditAfter}}
when is_integer(InitialCredit) andalso
is_integer(MoreCreditAfter) andalso
InitialCredit > 0 andalso
MoreCreditAfter > 0 andalso
MoreCreditAfter < InitialCredit ->
{InitialCredit, MoreCreditAfter};
Other ->
rabbit_log:error("Refusing to boot due to an invalid value of 'rabbit.credit_flow_default_credit'"),
throw({error, {invalid_credit_flow_default_credit_value, Other}})
end,
ok = persistent_term:put(credit_flow_default_credit, CreditFlowDefaultCredit),

%% Disallow 0 as it means unlimited:
%% "If this field is zero or unset, there is no maximum
%% size imposed by the link endpoint." [AMQP 1.0 §2.7.3]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckCertificateExpirationCommand do
alias RabbitMQ.CLI.Core.DocGuide
alias RabbitMQ.CLI.TimeUnit, as: TU
@behaviour RabbitMQ.CLI.CommandBehaviour

import RabbitMQ.CLI.Core.Listeners

@behaviour RabbitMQ.CLI.CommandBehaviour

def switches(), do: [unit: :string, within: :integer]

def merge_defaults(args, opts) do
Expand Down Expand Up @@ -102,9 +103,10 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckCertificateExpirationCommand do

def help_section(), do: :observability_and_health_checks

def description(),
do: "Checks the expiration date on the certificates for every listener configured to use TLS"
def description() do
"Checks the expiration date of every certificate (leaf, intermediary or any CA) in every certificate bundle file used by the node"
end

def banner(_, %{node: node_name}),
do: "Checking certificate expiration on node #{node_name} ..."
do: "Checking certificate expiration for all certificates on node #{node_name} ..."
end
Loading
Loading