From: varun gudisena <vg411h@att.com>
Date: Wed, 7 Feb 2018 16:41:18 +0000 (+0000)
Subject: Merge "sonar major for error-handling"
X-Git-Tag: v1.1.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=commitdiff_plain;h=82765e74a39c5f770e84f5fbe9bc285b404c0f78;hp=bcf5bd04ea03bb4909a9de508ed0a90518457e5b

Merge "sonar major for error-handling"
---

diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index e2bdeaf..ad1e20f 100644
--- a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
@@ -36,6 +36,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Properties;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jasypt.util.text.BasicTextEncryptor;
 
@@ -102,7 +103,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					logger.error("IOException" + e);
+					logger.error(" IOException occers " + e);
 				}
 			}
 		}
@@ -152,6 +153,7 @@ public class MirrorMakerAgent {
 			}
 			input = new FileInputStream(mmagenthome + "/etc/" + agentName + propName + ".properties");
 		} catch (IOException ex) {
+			logger.error(" IOException will be handled " + ex);
 			try {
 				input = new FileInputStream(mmagenthome + "/etc/" + propName + ".properties");
 				Properties prop = new Properties();
@@ -211,6 +213,7 @@ public class MirrorMakerAgent {
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
+						 Thread.currentThread().interrupt();
 					}
 					mirrorMakers.getListMirrorMaker().set(i, mm);
 				} else {
@@ -251,6 +254,7 @@ public class MirrorMakerAgent {
 				return topicMessage[0];
 			}
 		} catch (Exception e) {
+			logger.error(" Exception Occered " + e);
 			return "ERROR:" + e.getMessage() + " Server Response is:" + response;
 		}
 		return null;
@@ -281,6 +285,7 @@ public class MirrorMakerAgent {
 			return response;
 
 		} catch (Exception e) {
+			logger.error(" Exception Occered " + e);
 			return "ERROR:" + e.getLocalizedMessage();
 		}
 	}
@@ -346,7 +351,7 @@ public class MirrorMakerAgent {
 					} catch (Exception ex) {
 						connectionattempt++;
 						if (connectionattempt > 5) {
-							logger.info("Can't connect to the topic, mmagent shutting down , " + topicMessage);
+							logger.info("Can't connect to the topic, mmagent shutting down , " + topicMessage + ex);
 							return;
 						}
 						logger.info("Can't connect to the topic, " + topicMessage + " Retrying " + connectionattempt
@@ -399,7 +404,7 @@ public class MirrorMakerAgent {
 			out = new FileOutputStream(mmagenthome + "/etc/mmagent.config");
 			mirrorMakerProperties.store(out, "");
 		} catch (IOException ex) {
-			ex.printStackTrace();
+			logger.error(" IOException Occered " + ex);
 		} finally {
 			if (out != null) {
 				try {
@@ -440,15 +445,17 @@ public class MirrorMakerAgent {
 				try {
 					Thread.sleep(1000);
 				} catch (InterruptedException e) {
+					logger.log(Level.WARN, "Interrupted!", e);
+					Thread.currentThread().interrupt();
 				}
 			} catch (IOException ex) {
-				ex.printStackTrace();
+				logger.error(" IOException Occered " + ex);
 			} finally {
 				if (out != null) {
 					try {
 						out.close();
 					} catch (IOException e) {
-						e.printStackTrace();
+						logger.error(" IOException Occered " + e);
 					}
 				}
 			}
@@ -492,6 +499,7 @@ public class MirrorMakerAgent {
 						out.close();
 					} catch (IOException e) {
 						e.printStackTrace();
+						logger.error("IOException occered " + e);
 					}
 				}
 			}