update the shell script

[dmaap/messagerouter/mirroragent.git] / src / main / java / org / onap / dmaap / mr / dmaapMMAgent / utils / MirrorMakerProcessHandler.java

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 82086a3..114d1f8 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
 
 import org.apache.log4j.Logger;
 
-public class MirrorMakerProcessHandler {/*
+public class MirrorMakerProcessHandler {
        static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class);
        static String mmagenthome = System.getProperty("MMAGENTHOME");
 
@@ -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);
                        }
@@ -55,7 +55,7 @@ public class MirrorMakerProcessHandler {/*
                        BufferedReader br = new BufferedReader(isr);
                         
                        while ((line = br.readLine()) != null) {
-                               System.out.println(line);
+                               logger.info(line);
                //              if (line.contains("agentname=" + agentname) && line.contains("/bin/sh -c") == false) {
                                        
                                        //If enablelogCheck Check MirrorMaker log for errors and restart mirrormaker
@@ -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}')";
@@ -170,9 +170,9 @@ public class MirrorMakerProcessHandler {/*
                        } 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 + "' 2>&1 >"
+                                               + mmagenthome + "/logs/" + agentName + "_MMaker.log " };
                                final Process process = rt.exec(args);
                                new Thread() {
                                        public void run() {
@@ -197,4 +197,4 @@ public class MirrorMakerProcessHandler {/*
                        e.printStackTrace();
                }
        }
-*/}
+}