X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fatt%2Fnsa%2FdmaapMMAgent%2FMirrorMakerAgent.java;h=a187d89f9bf91b14ce4c668f76b31335fb8765b2;hp=070281c54b821d4885d75fe8e5190f89e322a5be;hb=06c55be75c1a50b186ded150afb394fccb10af58;hpb=cc4d512cc63a3014e340e8b641b9f0eaecc62831

diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index 070281c..a187d89 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,8 +103,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					logger.error("IOException" + e);
-					e.printStackTrace();
+					logger.error(" IOException occers " + e);
 				}
 			}
 		}
@@ -116,14 +116,14 @@ public class MirrorMakerAgent {
 			}
 			logger.info("kakahome is set :" + kafkahome);
 		} catch (IOException ex) {
-			logger.error(kafkahome + "/bin/kafka-run-class.sh not found.  Make sure kafka home is set correctly");
+			logger.error(kafkahome + "/bin/kafka-run-class.sh not found.  Make sure kafka home is set correctly" + ex);
 			return false;
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("IOException" + e);
 				}
 			}
 		}
@@ -153,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();
@@ -167,14 +168,14 @@ public class MirrorMakerAgent {
 				prop.store(out, "");
 
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("Exception at checkPropertiesFile " +e);
 			}
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("Exception occurred is " +e);
 				}
 			}
 			if (out != null) {
@@ -182,6 +183,7 @@ public class MirrorMakerAgent {
 					out.close();
 				} catch (IOException e) {
 					e.printStackTrace();
+					logger.error("IOException" + e);
 				}
 			}
 		}
@@ -211,6 +213,7 @@ public class MirrorMakerAgent {
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
+						 Thread.currentThread().interrupt();
 					}
 					mirrorMakers.getListMirrorMaker().set(i, mm);
 				} else {
@@ -361,7 +364,7 @@ public class MirrorMakerAgent {
 
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Exception is : " +e);
 		}
 
 	}
@@ -440,6 +443,8 @@ public class MirrorMakerAgent {
 				try {
 					Thread.sleep(1000);
 				} catch (InterruptedException e) {
+					logger.log(Level.WARN, "Interrupted!", e);
+					Thread.currentThread().interrupt();
 				}
 			} catch (IOException ex) {
 				ex.printStackTrace();
@@ -492,6 +497,7 @@ public class MirrorMakerAgent {
 						out.close();
 					} catch (IOException e) {
 						e.printStackTrace();
+						logger.error("IOException occered " + e);
 					}
 				}
 			}