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=71bd85cdea9bfd7ba60e576d59ea887f8b51ef72;hp=1f7ddc6882099a8deb69d6f19c62a2608084153f;hb=1092e4bd46a7e90c3e18f4ef44b6ab485d41d328;hpb=0885495037027c74e440ecc486f6bc45b90ff039

diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index 1f7ddc6..71bd85c 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;
 
@@ -51,7 +52,7 @@ import com.google.gson.internal.LinkedTreeMap;
 import com.sun.org.apache.xerces.internal.impl.dtd.models.CMAny;
 import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 
-public class MirrorMakerAgent {
+public class MirrorMakerAgent {/*
 	static final Logger logger = Logger.getLogger(MirrorMakerAgent.class);
 	Properties mirrorMakerProperties = new Properties();
 	ListMirrorMaker mirrorMakers = null;
@@ -109,7 +110,7 @@ public class MirrorMakerAgent {
 		loadProperties();
 		input = null;
 		try {
-			/*input = new FileInputStream(kafkahome + "/bin/kafka-run-class.sh");*/
+			input = new FileInputStream(kafkahome + "/bin/kafka-run-class.sh");
 			if(false) {
 				throw new IOException();
 			}
@@ -182,7 +183,7 @@ public class MirrorMakerAgent {
 					out.close();
 				} catch (IOException e) {
 					e.printStackTrace();
-					logger.error("IOException" + e);
+					logger.error("Exception is : "+e);
 				}
 			}
 		}
@@ -212,6 +213,7 @@ public class MirrorMakerAgent {
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
+						 Thread.currentThread().interrupt();
 					}
 					mirrorMakers.getListMirrorMaker().set(i, mm);
 				} else {
@@ -252,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;
@@ -282,6 +285,7 @@ public class MirrorMakerAgent {
 			return response;
 
 		} catch (Exception e) {
+			logger.error(" Exception Occered " + e);
 			return "ERROR:" + e.getLocalizedMessage();
 		}
 	}
@@ -347,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
@@ -362,7 +366,7 @@ public class MirrorMakerAgent {
 
 			}
 		} catch (Exception e) {
-			logger.error("Exception is : " +e);
+			logger.error("Exception at readAgentTopic : " + e);
 		}
 
 	}
@@ -386,7 +390,7 @@ public class MirrorMakerAgent {
 		} else if (exists == false && mirrorMakers == null) {
 			mirrorMakers = new ListMirrorMaker();
 			ArrayList<MirrorMaker> list = mirrorMakers.getListMirrorMaker();
-			list = new ArrayList<MirrorMaker>();
+			list = new ArrayList();
 			list.add(newMirrorMaker);
 			mirrorMakers.setListMirrorMaker(list);
 		}
@@ -400,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 {
@@ -441,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);
 					}
 				}
 			}
@@ -484,9 +490,11 @@ 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("Exception at updateWhiteList : " + ex);
 			} finally {
 				if (out != null) {
 					try {
@@ -591,4 +599,4 @@ public class MirrorMakerAgent {
 		}
 
 	}
-}
+*/}