Skip to content
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.

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

ARTEMIS-4909 use names that match original xml tags #5075

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

erwindon
Copy link
Contributor

@erwindon erwindon commented Jul 8, 2024

@gemmellr
Copy link
Member

This all seems to assume that the config is only coming from the XML tags, which actually isnt necessarily the case, so it feels like this should stay more general as it currently is.

@@ -4689,11 +4689,11 @@ private static void setUnsetQueueParamsToDefaults(QueueConfiguration c) {

private void deployReloadableConfigFromConfiguration() throws Exception {
if (configurationReloadDeployed.compareAndSet(false, true)) {
ActiveMQServerLogger.LOGGER.reloadingConfiguration("security");
ActiveMQServerLogger.LOGGER.reloadingConfiguration("security-settings");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could see making this "security settings", i.e adding " settings" to make it consistent with the "address settings" one below (which would remain as it was), but I dont think they should strictly match the XML tags since that may in fact not be where the configuration is coming from.

@jbertram
Copy link
Contributor

jbertram commented Aug 6, 2024

Some more context here...

The broker currently supports configuration via XML, properties, and the management API. JSON support was also recently added. All of these use some variant of the words "security," "address," and "settings" together, and I think it's reasonable for the log to use wording consistent with this. However, the wording in the log doesn't need to be exactly the same as the XML.

I recommend you keep address settings as it is in the log and just change security to security settings.

@erwindon
Copy link
Contributor Author

erwindon commented Aug 6, 2024

thank for your comments. I'll update the PR with Justin's suggestion.

@erwindon erwindon force-pushed the ARTEMIS-4909_reload_conf_names branch from 55fc435 to ecab2fd Compare August 6, 2024 20:45
@erwindon
Copy link
Contributor Author

erwindon commented Aug 6, 2024

PR is updated (and rebased)

@jbertram jbertram merged commit 14b6800 into apache:main Aug 6, 2024
@jbertram
Copy link
Contributor

jbertram commented Aug 6, 2024

@erwindon, thanks!

@erwindon erwindon deleted the ARTEMIS-4909_reload_conf_names branch August 6, 2024 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants