From 29e7063b7f1832d14fd92642914e6917da45c18c Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 2 Nov 2018 10:11:48 -0400 Subject: Explicitly exit on timeout Previously, when timeout occurs trying to connect successfully to SDC, code just dropped out of loop in main() method, expecting to exit. However, if the SDC client left any threads hanging, that might not cause process to exit. Instead, process should explicitly exit via System.exit(). Change-Id: I28316550cbfc2bbddeaadf080c0afa52a1eae350 Issue-ID: SDNC-472 Signed-off-by: Timoney, Dan (dt5972) --- .../onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ueb-listener') diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java index 4f2de1cc1..2078a798f 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebClient.java @@ -54,6 +54,7 @@ public class SdncUebClient { long maxWaitTm = config.getClientStartupTimeout() * 1000L; boolean keepWaiting = true; + boolean listenerStarted = false; while (keepWaiting) { if (result.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) { @@ -66,8 +67,9 @@ public class SdncUebClient { if (start.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) { keepWaiting = false; + listenerStarted = true; } else { - LOG.info("SDC returned "+start.getDistributionActionResult().toString()+" - will retry"); + LOG.info("SDC returned {} - exitting",start.getDistributionActionResult().toString()); try { client.stop(); } catch(Exception e1) { @@ -99,8 +101,13 @@ public class SdncUebClient { } } - - + + if (!listenerStarted) { + LOG.info("Timed out waiting to connect to SDC"); + System.exit(0); + } + + } -- cgit 1.2.3-korg