X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fmr%2FdmaapMMAgent%2Futils%2FMirrorMakerProcessHandler.java;h=625fbc89fb8829808e38e3a3d4fedbd65851678d;hb=HEAD;hp=37e0981be79d18e6c3a24da7dbf8bde24ec9250f;hpb=b6688e0be2295a96f089b7692e655bdfb0442165;p=dmaap%2Fmessagerouter%2Fmirroragent.git

diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
index 37e0981..625fbc8 100644
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
@@ -24,12 +24,12 @@ package org.onap.dmaap.mr.dmaapMMAgent.utils;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class MirrorMakerProcessHandler {
-	static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class);
-	static String mmagenthome = System.getProperty("MMAGENTHOME");
+	private static final Logger logger = LogManager.getLogger(MirrorMakerProcessHandler.class);
+	static String mmagenthome = "/opt";
 
 	public static boolean checkMirrorMakerProcess(String agentname, boolean enablelogCheck, String grepLog) throws Exception {
 		String line,linelog;
@@ -45,7 +45,7 @@ public class MirrorMakerProcessHandler {
 			} else {
 				//String args[] = { "/bin/sh", "-c", "ps -ef |grep java |grep agentname=" + agentname + "~" };
 				
-				String args[] = { "/bin/sh", "-c", "ps -ef | grep `ps -ef |grep agentname=" + agentname + "~ | egrep -v 'grep|java' | awk '{print $2}' `| egrep -v '/bin/sh|grep' "};
+				String args[] = { "/bin/sh", "-c", "ps -ef |grep agentname=" + agentname + "| grep -v grep | awk '{print $1}'"};
 				logger.info("CheckMM process->"+args[2]);
 				mmprocess = rt.exec(args);
 			}
@@ -97,7 +97,7 @@ public class MirrorMakerProcessHandler {
 			//	}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Error occured in MirrorMakerProcessHandler.checkMirrorMakerProcess"+e);
 		}
 		return false;
 	}
@@ -118,7 +118,7 @@ public class MirrorMakerProcessHandler {
 				//String args[] = { "/bin/sh", "-c",
 				//		"kill -9 `ps -ef |grep agentname=" + agentname + "~| egrep -v 'grep|java' | awk '{print $2}'` | egrep -v '/bin/sh|grep'"};
 				String args[] = { "/bin/sh", "-c",
-						"for i in `ps -ef |grep agentname="+ agentname + "~ | egrep -v 'grep|java' | awk '{print $2}'`;do kill -9 `ps -eaf | grep $i | egrep -v '/bin/sh|grep' | awk '{print $2}'` ;done"};
+						"kill -9 $(ps -ef | grep agentname=" + agentname + "| grep -v grep | awk '{print $1}')"};
 				logger.info ("Stop MM ->"+args[2]);				
 				// args = "kill $(ps -ef |grep java |grep agentname=" +
 				// agentname + "~| awk '{print $2}')";
@@ -135,7 +135,7 @@ public class MirrorMakerProcessHandler {
 
 			logger.info("Mirror Maker " + agentname + " Stopped");
 		} catch (Exception e) {
-			e.printStackTrace();
+		    logger.error("exception occured in stopMirrorMaker ", e);
 		}
 
 	}
@@ -163,16 +163,16 @@ public class MirrorMakerProcessHandler {
 								// System.out.println(line);
 							}
 						} catch (Exception anExc) {
-							anExc.printStackTrace();
+						    logger.error("exception occured in startMirrorMaker ", anExc);
 						}
 					}
 				}.start();
 			} else {
 				String args[] = { "/bin/sh", "-c",
 						kafkaHome + "/bin/kafka-run-class.sh -Dagentname=" + agentName
-								+ "~ kafka.tools.MirrorMaker --consumer.config " + consumerConfig
-								+ " --producer.config " + producerConfig + " --num.streams " + numStreams + "  --abort.on.send.failure true" + " --whitelist '" + whitelist + "' >"
-								+ mmagenthome + "/logs/" + agentName + "_MMaker.log 2>&1" };
+						+ " kafka.tools.MirrorMaker --consumer.config " + consumerConfig
+						+ " --producer.config " + producerConfig + " --num.streams " + numStreams + "  --abort.on.send.failure true" + " --whitelist '" + whitelist + "'  >"
+						+ mmagenthome + "/logs/" + agentName + "_MMaker.log 2>&1" };
 				final Process process = rt.exec(args);
 				new Thread() {
 					public void run() {
@@ -185,7 +185,7 @@ public class MirrorMakerProcessHandler {
 								// System.out.println(line);
 							}
 						} catch (Exception anExc) {
-							anExc.printStackTrace();
+						    logger.error("exception occured in startMirrorMaker ", anExc);
 						}
 					}
 				}.start();
@@ -194,7 +194,7 @@ public class MirrorMakerProcessHandler {
 			logger.info("Mirror Maker " + agentName + " Started" + " WhiteListing:" + whitelist);
 
 		} catch (Exception e) {
-			e.printStackTrace();
+		    logger.error("exception occured in startMirrorMaker ", e);
 		}
 	}
 }