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=61515bc6998c5099302c6c7ccb56cc1926ddce5b;hp=86a653dc60a6147f1f5eedf633b642a559faa491;hb=82136c1fd201cf815cdd85a0f02e8dd6316d6ec7;hpb=b07822276c0bba8896d05555094c6e53f69ca2fb

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 86a653d..61515bc 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -56,7 +56,7 @@ public class MirrorMakerAgent {
 	static final Logger logger = Logger.getLogger(MirrorMakerAgent.class);
 	Properties mirrorMakerProperties = new Properties();
 	ListMirrorMaker mirrorMakers = null;
-	String mmagenthome = "";
+	String mmagenthome = "/opt";
 	String kafkahome = "";
 	String topicURL = "";
 	String topicname = "";
@@ -100,7 +100,7 @@ public class MirrorMakerAgent {
 	private boolean checkStartup() {
 		FileInputStream input = null;
 		try {
-			this.mmagenthome = System.getProperty("MMAGENTHOME");
+			//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) {
@@ -111,7 +111,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -128,7 +128,7 @@ public class MirrorMakerAgent {
 				try {
 					input.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkStartup "+e);
 				}
 			}
 		}
@@ -139,7 +139,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);
@@ -176,7 +176,7 @@ public class MirrorMakerAgent {
 				prop.store(out, "");
 
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("exception occured in checkPropertiesFile "+e);
 			}
 		} finally {
 			if (input != null) {
@@ -190,7 +190,7 @@ public class MirrorMakerAgent {
 				try {
 					out.close();
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("exception occured in checkPropertiesFile "+e);
 				}
 			}
 		}