mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-07-31 17:38:33 +00:00
[ACS-9839] Introduced ACTIVEMQ_URL_PARAMS to avoid the need to override spring.activemq.broker-url directly (#1110)
* [ACS-9839] Introduced ACTIVEMQ_CONN_OPTIONS to avoid the need to override spring.activemq.broker-url directly. * [ACS-9839] ACTIVEMQ_CONN_OPTIONS -> ACTIVEMQ_URL_PARAMS rename * [ACS-9839] Restore removed comment
This commit is contained in:
@@ -55,8 +55,9 @@ public class MessagingInfo
|
||||
// For backwards-compatibility, we continue to rely on setting ACTIVEMQ_URL environment variable (see application.yaml)
|
||||
// The MessagingConfig class uses on ConditionalOnProperty (ie. activemq.url is set and not false)
|
||||
|
||||
// Note: as per application.yaml the broker url is appended with "?jms.watchTopicAdvisories=false". If this needs to be fully
|
||||
// overridden then it would require explicitly setting both "spring.activemq.broker-url" *and* "activemq.url" (latter to non-false value).
|
||||
// Note: as per application.yaml the broker url is appended with ACTIVEMQ_URL_PARAMS with default value "?jms.watchTopicAdvisories=false".
|
||||
// If this needs to be fully overridden then it would require explicitly setting both "spring.activemq.broker-url"
|
||||
// *and* "activemq.url" (latter to non-false value). ACTIVEMQ_URL_PARAMS value will be ignored in that case.
|
||||
|
||||
if ((activemqUrl != null) && (!activemqUrl.equals("false")))
|
||||
{
|
||||
|
@@ -5,7 +5,7 @@ spring:
|
||||
max-file-size: 8192MB
|
||||
max-request-size: 8192MB
|
||||
activemq:
|
||||
broker-url: ${ACTIVEMQ_URL:nio://localhost:61616}?jms.watchTopicAdvisories=false
|
||||
broker-url: ${ACTIVEMQ_URL:nio://localhost:61616}${ACTIVEMQ_URL_PARAMS:?jms.watchTopicAdvisories=false}
|
||||
user: ${ACTIVEMQ_USER:admin}
|
||||
password: ${ACTIVEMQ_PASSWORD:admin}
|
||||
pool:
|
||||
|
Reference in New Issue
Block a user