Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static Connection createRabbitConnection(final RabbitConfiguration rc,
final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm);
trustManagerFactory.init((KeyStore) null);

final SSLContext context = SSLContext.getInstance("TLS");
final SSLContext context = SSLContext.getInstance("TLSv1.2");
context.init(null, trustManagerFactory.getTrustManagers(), null);

factory.useSslProtocol(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public WorkerQueueMetricsReporter getMetrics()
@Override
public HealthResult healthCheck()
{
if (!conn.isOpen()) {
if (conn == null || !conn.isOpen()) {
return new HealthResult(HealthStatus.UNHEALTHY, "Rabbit connection failed");
} else if (!incomingChannel.isOpen()) {
return new HealthResult(HealthStatus.UNHEALTHY, "Incoming channel failed");
Expand Down