diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index 0d60caa8c..1cdefdebb 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -838,6 +838,7 @@ featured_apis=elasticSearchWarehouseV300 # rabbitmq_connector.port=5672 # rabbitmq_connector.username=obp # rabbitmq_connector.password=obp +# rabbitmq_connector.virtual_host=/ # -- RabbitMQ Adapter -------------------------------------------- #rabbitmq.adapter.enabled=false diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/MockedRabbitMqAdapter.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/MockedRabbitMqAdapter.scala index 130e9d236..07b4ca1e9 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/MockedRabbitMqAdapter.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/MockedRabbitMqAdapter.scala @@ -3082,6 +3082,7 @@ object MockedRabbitMqAdapter extends App with MdcLoggable{ factory.setPort(port) factory.setUsername(username) factory.setPassword(password) + factory.setVirtualHost(virtualHost) if (APIUtil.getPropsAsBoolValue("rabbitmq.use.ssl", false)){ factory.useSslProtocol(RabbitMQUtils.createSSLContext( keystorePath, diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala index 5a245140c..489380b2d 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala @@ -17,6 +17,7 @@ class RabbitMQConnectionFactory extends BasePooledObjectFactory[Connection] { factory.setPort(port) factory.setUsername(username) factory.setPassword(password) + factory.setVirtualHost(virtualHost) if (APIUtil.getPropsAsBoolValue("rabbitmq.use.ssl", false)){ factory.useSslProtocol(RabbitMQUtils.createSSLContext( keystorePath, diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQUtils.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQUtils.scala index 9b177d8d6..fd254c6cd 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQUtils.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQUtils.scala @@ -28,6 +28,7 @@ object RabbitMQUtils extends MdcLoggable{ val port = APIUtil.getPropsAsIntValue("rabbitmq_connector.port").openOrThrowException("mandatory property rabbitmq_connector.port is missing!") val username = APIUtil.getPropsValue("rabbitmq_connector.username").openOrThrowException("mandatory property rabbitmq_connector.username is missing!") val password = APIUtil.getPropsValue("rabbitmq_connector.password").openOrThrowException("mandatory property rabbitmq_connector.password is missing!") + val virtualHost = APIUtil.getPropsValue("rabbitmq_connector.virtual_host").openOrThrowException("mandatory property rabbitmq_connector.virtual_host is missing!") val keystorePath = APIUtil.getPropsValue("keystore.path").getOrElse("") val keystorePassword = APIUtil.getPropsValue("keystore.password").getOrElse(APIUtil.initPasswd)