X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fmr%2FdmaapMMAgent%2FMirrorMakerAgent.java;h=afab7f606165264346deb80aabda6a78b05e2ed8;hp=3b2f2018b491008538d2dbc172567d2d163a4e88;hb=2757afb4727dd82d834cdd788d10c162fe4b89f5;hpb=b64034c4f7b6dafea01961af501c3e03f174d1ba

diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
index 3b2f201..afab7f6 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -92,18 +92,17 @@ public class MirrorMakerAgent {
 	private boolean checkStartup() {
 		FileInputStream input = null;
 		try {
-			//this.mmagenthome = System.getProperty("MMAGENTHOME");
 			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.");
 			return false;
 		} finally {
 			if (input != null) {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -111,7 +110,7 @@ public class MirrorMakerAgent {
 		input = null;
 		try {
 			input = new FileInputStream(kafkahome + "/bin/kafka-run-class.sh");
-			logger.info("kakahome is set :" + kafkahome);
+			logger.info("kafkahome is set :" + kafkahome);
 		} catch (IOException ex) {
 			logger.error(kafkahome + "/bin/kafka-run-class.sh not found.  Make sure kafka home is set correctly");
 			return false;
@@ -120,7 +119,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -131,7 +130,7 @@ public class MirrorMakerAgent {
 			return false;
 		}
 		logger.info("Published to Topic :" + this.topicname + " Successfully");
-		response = topicUtil.subscribeTopic(topicURL, topicname, "1", response, response);
+		response = topicUtil.subscribeTopic(topicURL, topicname, "1", mechid, password);
 		if (response != null && response.startsWith("ERROR:")) {
 			logger.error("Problem subscribing to topic, please verify the config " + this.topicname + " MR URL is:"
 					+ this.topicURL + " Error is:  " + response);
@@ -168,7 +167,7 @@ public class MirrorMakerAgent {
 				prop.store(out, "");
 
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("exception occured in checkPropertiesFile "+e);
 			}
 		} finally {
 			if (input != null) {
@@ -182,7 +181,7 @@ public class MirrorMakerAgent {
 				try {
 					out.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkPropertiesFile "+e);
 				}
 			}
 		}