From 242ccfd7106fd20c56de0c536db8d85196e82715 Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Wed, 31 Jul 2019 14:03:36 +0300 Subject: [PATCH 1/3] DEF001: Shut down the channel after checking health status. Signed-off-by: Stoyan Tzenkov --- .../account/healthindicators/GrpcServerHealthIndicator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java index a7c9dcf..6cb54b6 100644 --- a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java +++ b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java @@ -47,6 +47,8 @@ public class GrpcServerHealthIndicator implements HealthIndicator { AccountServiceGrpc.getServiceDescriptor().getName(), e.getMessage()); LOGGER.debug(null, e.getCause()); return Health.down().build(); + } finally { + channel.shutdown(); } switch (servingStatus) { -- GitLab From 6c6ab7954961cf6d82af3a6ac1598cf9bc32a21a Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Wed, 31 Jul 2019 14:09:33 +0300 Subject: [PATCH 2/3] Check if channel is not null. Signed-off-by: Stoyan Tzenkov --- .../account/healthindicators/GrpcServerHealthIndicator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java index 6cb54b6..d8a157a 100644 --- a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java +++ b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java @@ -48,7 +48,9 @@ public class GrpcServerHealthIndicator implements HealthIndicator { LOGGER.debug(null, e.getCause()); return Health.down().build(); } finally { - channel.shutdown(); + if (channel != null) { + channel.shutdown(); + } } switch (servingStatus) { -- GitLab From ae38a02512e5131933a3978f5cf480765a71b898 Mon Sep 17 00:00:00 2001 From: Bogdan Alov Date: Wed, 31 Jul 2019 14:13:47 +0300 Subject: [PATCH 3/3] updating chart version for the account service --- charts/account-service/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/account-service/Chart.yaml b/charts/account-service/Chart.yaml index 0d67982..ae0266d 100644 --- a/charts/account-service/Chart.yaml +++ b/charts/account-service/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja account service. name: account-service -version: 0.1.9 +version: 0.2.0 -- GitLab