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=705a9c20696387bdb603a8c324c52578d816e3c0;hb=1092e4bd46a7e90c3e18f4ef44b6ab485d41d328;hpb=5be3b78cd2fdef0aa053107d4c936878dbf35c75

diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index 705a9c2..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;
@@ -95,14 +96,14 @@ public class MirrorMakerAgent {
 			input = new FileInputStream(mmagenthome + "/etc/mmagent.config");
 			logger.info("mmagenthome is set :" + mmagenthome + " loading properties at /etc/mmagent.config");
 		} catch (IOException ex) {
-			logger.error(mmagenthome + "/etc/mmagent.config not found.  Set -DMMAGENTHOME and check the config file");
+			logger.error(mmagenthome + "/etc/mmagent.config not found.  Set -DMMAGENTHOME and check the config file" + ex);
 			return false;
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error(" IOException occers " + e);
 				}
 			}
 		}
@@ -110,16 +111,19 @@ public class MirrorMakerAgent {
 		input = null;
 		try {
 			input = new FileInputStream(kafkahome + "/bin/kafka-run-class.sh");
+			if(false) {
+				throw new IOException();
+			}
 			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);
 				}
 			}
 		}
@@ -149,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();
@@ -163,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) {
@@ -178,6 +183,7 @@ public class MirrorMakerAgent {
 					out.close();
 				} catch (IOException e) {
 					e.printStackTrace();
+					logger.error("Exception is : "+e);
 				}
 			}
 		}
@@ -207,6 +213,7 @@ public class MirrorMakerAgent {
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
+						 Thread.currentThread().interrupt();
 					}
 					mirrorMakers.getListMirrorMaker().set(i, mm);
 				} else {
@@ -247,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;
@@ -277,6 +285,7 @@ public class MirrorMakerAgent {
 			return response;
 
 		} catch (Exception e) {
+			logger.error(" Exception Occered " + e);
 			return "ERROR:" + e.getLocalizedMessage();
 		}
 	}
@@ -342,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
@@ -357,12 +366,12 @@ public class MirrorMakerAgent {
 
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Exception at readAgentTopic : " + e);
 		}
 
 	}
 
-	private void createMirrorMaker(MirrorMaker newMirrorMaker) {
+	protected void createMirrorMaker(MirrorMaker newMirrorMaker) {
 		boolean exists = false;
 		if (mirrorMakers != null) {
 			int mirrorMakersCount = mirrorMakers.getListMirrorMaker().size();
@@ -381,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);
 		}
@@ -395,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 {
@@ -436,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);
 					}
 				}
 			}
@@ -479,15 +490,18 @@ 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 {
 						out.close();
 					} catch (IOException e) {
 						e.printStackTrace();
+						logger.error("IOException occered " + e);
 					}
 				}
 			}
@@ -585,4 +599,4 @@ public class MirrorMakerAgent {
 		}
 
 	}
-}
+*/}