Skip to content

Backport config handling with Cuttlefish #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
May 4, 2020
Merged

Backport config handling with Cuttlefish #2336

merged 2 commits into from
May 4, 2020

Conversation

@dumbbell
Copy link
Collaborator

@dumbbell dumbbell commented May 4, 2020 •
edited
Loading

See #2277.

dumbbell added 2 commits May 4, 2020 12:48
@dumbbell
rabbit_prelaunch_conf: Always handle config. files with Cuttlefish
8a72a8d 
This has several benefits:

1. It simplifies the code, all configuration being handled by the same
   code path (no more condition on Erlang-term-based vs. Cuttlefish).
   `rabbit_config` shrinks quite a lot in the process.

2. We can use additional configuration files AND an Erlang-term-based
   configuration file. In other words, it is possible to use the same
   existing Erlang-term-based file and introduce Cuttlefish files when
   needed.

   It allows a user to run RabbitMQ with:

   RABBITMQ_CONFIG_FILE=/path/to/rabbitmq.config \
   RABBITMQ_CONFIG_FILES=/path/to/conf.d/*.conf \
   ./sbin/rabbitmq-server

   A developer can do the same with `make run-broker`:

   make run-broker \
   RABBITMQ_CONFIG_FILES=/path/to/conf.d/*.conf

   In the example above, the main configuration file generated by
   rabbitmq-run.mk is an Erlang-term-based one.

This is implemented by calling Cuttlefish with a (possibly empty) list
of additional files and the Erlang-term-based file as the advanced
configuration file.

References #2180.

(cherry picked from commit 7edfe22)
@dumbbell
rabbit_config: Deprecate schema_dir/0
e64321c 
It is unused in RabbitMQ or tier-1 plugins, and the previously returned
value made no sense since the switch to Cuttlefish as a library (as part
of #2180).

(cherry picked from commit 5f5fccf)
@dumbbell dumbbell force-pushed the backport-config-handling-with-cuttlefish branch from 61fefb6 to e64321c Compare May 4, 2020 10:49
@dumbbell dumbbell marked this pull request as ready for review May 4, 2020 11:05
@dumbbell dumbbell merged commit bb2f3dd into v3.8.x May 4, 2020
@dumbbell dumbbell deleted the backport-config-handling-with-cuttlefish branch May 4, 2020 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dumbbell