mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fix JMS health indicator
This commit improves the JMS health indicator to identify a broken broker that uses failover. An attempt to start the connection is a good way to make sure that it is effectively available. Closes gh-6818
This commit is contained in:
parent
e3ca5e7107
commit
b88cb35ea2
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2015 the original author or authors.
|
* Copyright 2012-2016 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -37,6 +37,7 @@ public class JmsHealthIndicator extends AbstractHealthIndicator {
|
|||||||
protected void doHealthCheck(Health.Builder builder) throws Exception {
|
protected void doHealthCheck(Health.Builder builder) throws Exception {
|
||||||
Connection connection = this.connectionFactory.createConnection();
|
Connection connection = this.connectionFactory.createConnection();
|
||||||
try {
|
try {
|
||||||
|
connection.start();
|
||||||
builder.up().withDetail("provider",
|
builder.up().withDetail("provider",
|
||||||
connection.getMetaData().getJMSProviderName());
|
connection.getMetaData().getJMSProviderName());
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2015 the original author or authors.
|
* Copyright 2012-2016 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -22,6 +22,7 @@ import javax.jms.ConnectionMetaData;
|
|||||||
import javax.jms.JMSException;
|
import javax.jms.JMSException;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.mockito.BDDMockito.given;
|
import static org.mockito.BDDMockito.given;
|
||||||
@ -78,4 +79,21 @@ public class JmsHealthIndicatorTests {
|
|||||||
verify(connection, times(1)).close();
|
verify(connection, times(1)).close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void jmsBrokerUsesFailover() throws JMSException {
|
||||||
|
ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
|
||||||
|
ConnectionMetaData connectionMetaData = mock(ConnectionMetaData.class);
|
||||||
|
given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider");
|
||||||
|
Connection connection = mock(Connection.class);
|
||||||
|
given(connection.getMetaData()).willReturn(connectionMetaData);
|
||||||
|
Mockito.doThrow(new JMSException("Could not start", "123"))
|
||||||
|
.when(connection).start();
|
||||||
|
given(connectionFactory.createConnection())
|
||||||
|
.willReturn(connection);
|
||||||
|
JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory);
|
||||||
|
Health health = indicator.health();
|
||||||
|
assertEquals(Status.DOWN, health.getStatus());
|
||||||
|
assertEquals(null, health.getDetails().get("provider"));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user