From e53f898dc82f4a8b9172b6a4e7ec017500bee7ca Mon Sep 17 00:00:00 2001
From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 9 Nov 2017 15:54:02 +0800
Subject: [PATCH] Add the Stacktrace into the Log

Change-Id: I8b9274e05ae0c5885455ae303819748f8bf7949e
Issue-ID: HOLMES-86
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
---
 .../main/java/org/onap/holmes/common/aai/CorrelationUtil.java  |  2 +-
 .../org/onap/holmes/common/dcae/DcaeConfigurationsCache.java   |  2 ++
 .../main/java/org/onap/holmes/common/dmaap/DmaapService.java   | 10 +++++-----
 .../main/java/org/onap/holmes/common/producer/MQProducer.java  |  4 ++--
 .../src/main/java/org/onap/holmes/common/utils/HttpsUtils.java |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/CorrelationUtil.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/CorrelationUtil.java
index 9295f53..6520552 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/CorrelationUtil.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/CorrelationUtil.java
@@ -60,7 +60,7 @@ public class CorrelationUtil {
         try {
             vmEntity = aaiQuery.getAaiVmData(rootSourceId, rootSourceName);
         } catch (CorrelationException e) {
-            log.error("Failed to get vm data", e.getMessage());
+            log.error("Failed to get the VM data.", e);
         }
         return vmEntity;
     }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationsCache.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationsCache.java
index 8646abe..2503ce2 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationsCache.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/DcaeConfigurationsCache.java
@@ -15,9 +15,11 @@
  */
 package org.onap.holmes.common.dcae;
 
+import lombok.extern.slf4j.Slf4j;
 import org.onap.holmes.common.dcae.entity.DcaeConfigurations;
 import org.onap.holmes.common.dcae.entity.SecurityInfo;
 
+@Slf4j
 public class DcaeConfigurationsCache {
 
     private static DcaeConfigurations dcaeConfigurations = new DcaeConfigurations();
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
index 738bfd9..f2fd3a1 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/dmaap/DmaapService.java
@@ -50,11 +50,11 @@ public class DmaapService {
             publisher.publish(policyMsg);
             log.info("send policyMsg: " + JacksonUtil.beanToJson(policyMsg));
         } catch (CorrelationException e) {
-            log.error("Failed to publish policyMsg to dmaap", e.getMessage());
+            log.error("Failed to publish the control loop event to DMaaP", e);
         } catch (JsonProcessingException e) {
-            log.info("Failed to convert policyMsg to json");
+            log.info("Failed to convert the control loop event to json");
         } catch (NullPointerException e) {
-            log.error("DMaaP configurations does not exist!");
+            log.error("DMaaP configurations do not exist!");
         }
     }
 
@@ -155,7 +155,7 @@ public class DmaapService {
         try {
             vnfEntity = aaiQuery.getAaiVnfData(vnfId, vnfName);
         } catch (CorrelationException e) {
-            log.error("Failed to get vnf data", e.getMessage());
+            log.error("Failed to get the VNF data.", e);
         }
         return vnfEntity;
     }
@@ -165,7 +165,7 @@ public class DmaapService {
         try {
             vmEntity = aaiQuery.getAaiVmData(sourceId, sourceName);
         } catch (CorrelationException e) {
-            log.error("Failed to get vm data", e.getMessage());
+            log.error("Failed to get the VM data.", e);
         }
         return vmEntity;
     }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
index 9483bb6..fd91bbd 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/producer/MQProducer.java
@@ -84,13 +84,13 @@ public class MQProducer {
             messageProducer.send(message);
             session.commit();
         } catch (Exception e) {
-            log.error("Failed send correlation." + e.getMessage(), e);
+            log.error("Failed send correlation. " + e.getMessage(), e);
         } finally {
             if (connection != null) {
                 try {
                     connection.close();
                 } catch (JMSException e) {
-                    log.error("Failed close connection." + e.getMessage(), e);
+                    log.error("Failed close connection. " + e.getMessage(), e);
                 }
             }
         }
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
index 0c93c42..3d3c827 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java
@@ -74,7 +74,7 @@ public class HttpsUtils {
             connectionManager = new PoolingHttpClientConnectionManager(registry);
             connectionManager.setMaxTotal(200);
         } catch (Exception e) {
-            log.error("Failed to initialize the ssl builder: " + e.getMessage());
+            log.error("Failed to initialize the ssl builder: " + e.getMessage(), e);
         }
     }
 
-- 
2.16.6