[DMAAP MM] Update info.yaml

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

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 c205440..f47adfb 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -21,6 +21,8 @@
  *******************************************************************************/
 package org.onap.dmaap.mr.dmaapMMAgent;
 
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -29,8 +31,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Properties;
-
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jasypt.util.text.BasicTextEncryptor;
 import org.json.JSONObject;
 import org.onap.dmaap.mr.dmaapMMAgent.dao.CreateMirrorMaker;
@@ -41,11 +43,8 @@ import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateMirrorMaker;
 import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateWhiteList;
 import org.onap.dmaap.mr.dmaapMMAgent.utils.MirrorMakerProcessHandler;
 
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-
 public class MirrorMakerAgent {
-       static final Logger logger = Logger.getLogger(MirrorMakerAgent.class);
+       private static final Logger logger = LogManager.getLogger(MirrorMakerAgent.class);
        Properties mirrorMakerProperties = new Properties();
        ListMirrorMaker mirrorMakers = null;
        String mmagenthome = "/opt";
@@ -79,8 +78,7 @@ public class MirrorMakerAgent {
                        try {
                                agent.checkAgentProcess();
                        } catch (Exception e) {
-
-                               e.printStackTrace();
+                           logger.error("exception occured in checkAgentProcess ", e);
                        }
                        agent.readAgentTopic();
                } else {
@@ -92,11 +90,10 @@ 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.", ex);
                        return false;
                } finally {
                        if (input != null) {
@@ -111,9 +108,9 @@ 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");
+                       logger.error(kafkahome + "/bin/kafka-run-class.sh not found.  Make sure kafka home is set correctly", ex);
                        return false;
                } finally {
                        if (input != null) {
@@ -175,7 +172,7 @@ public class MirrorMakerAgent {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                   logger.error("exception occured in checkPropertiesFile ", e);
                                }
                        }
                        if (out != null) {
@@ -270,7 +267,7 @@ public class MirrorMakerAgent {
 
                        }
                } catch (Exception e) {
-                       e.printStackTrace();
+                   logger.error("exception occured in readAgentTopic ", e);
                }
 
        }
@@ -308,13 +305,13 @@ public class MirrorMakerAgent {
                        out = new FileOutputStream(mmagenthome + "/etc/mmagent.config");
                        mirrorMakerProperties.store(out, "");
                } catch (IOException ex) {
-                       ex.printStackTrace();
+                   logger.error("exception occured in createMirrorMaker ", ex);
                } finally {
                        if (out != null) {
                                try {
                                        out.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                   logger.error("exception occured in createMirrorMaker ", e);
                                }
                        }
                }
@@ -362,13 +359,13 @@ public class MirrorMakerAgent {
                                } catch (InterruptedException e) {
                                }
                        } catch (IOException ex) {
-                               ex.printStackTrace();
+                           logger.error("exception occured in updateMirrorMaker ", ex);
                        } finally {
                                if (out != null) {
                                        try {
                                                out.close();
                                        } catch (IOException e) {
-                                               e.printStackTrace();
+                                           logger.error("exception occured in updateMirrorMaker ", e);
                                        }
                                }
                        }
@@ -405,13 +402,13 @@ public class MirrorMakerAgent {
                                } catch (InterruptedException e) {
                                }
                        } catch (IOException ex) {
-                               ex.printStackTrace();
+                           logger.error("exception occured in updateWhiteList ", ex);
                        } finally {
                                if (out != null) {
                                        try {
                                                out.close();
                                        } catch (IOException e) {
-                                               e.printStackTrace();
+                                           logger.error("exception occured in updateWhiteList ", e);
                                        }
                                }
                        }
@@ -440,12 +437,14 @@ public class MirrorMakerAgent {
                                File file = new File(path);
                                file.delete();
                        } catch (Exception ex) {
+                           logger.error("exception occured in deleteMirrorMaker ", ex);
                        }
                        try {
                                String path = mmagenthome + "/etc/" + newMirrorMaker.name + "producer" + ".properties";
                                File file = new File(path);
                                file.delete();
                        } catch (Exception ex) {
+                           logger.error("exception occured in deleteMirrorMaker ", ex);
                        }
                        Gson g = new Gson();
                        mirrorMakerProperties.setProperty("mirrormakers", g.toJson(this.mirrorMakers));
@@ -455,13 +454,13 @@ public class MirrorMakerAgent {
                                mirrorMakerProperties.store(out, "");
                                MirrorMakerProcessHandler.stopMirrorMaker(newMirrorMaker.name);
                        } catch (IOException ex) {
-                               ex.printStackTrace();
+                           logger.error("exception occured in deleteMirrorMaker ", ex);
                        } finally {
                                if (out != null) {
                                        try {
                                                out.close();
                                        } catch (IOException e) {
-                                               e.printStackTrace();
+                                           logger.error("exception occured in deleteMirrorMaker ", e);
                                        }
                                }
                        }
@@ -480,7 +479,7 @@ public class MirrorMakerAgent {
                        if (mirrorMakerProperties.getProperty("mirrormakers") == null) {
                                this.mirrorMakers = new ListMirrorMaker();
                                ArrayList<MirrorMaker> list = this.mirrorMakers.getListMirrorMaker();
-                               list = new ArrayList<MirrorMaker>();
+                               list = new ArrayList<>();
                                this.mirrorMakers.setListMirrorMaker(list);
                        } else {
                                this.mirrorMakers = g.fromJson(mirrorMakerProperties.getProperty("mirrormakers"),
@@ -497,13 +496,13 @@ public class MirrorMakerAgent {
                        textEncryptor.setPassword(secret);
                        this.password = textEncryptor.decrypt(mirrorMakerProperties.getProperty("password"));
                } catch (Exception ex) {
-                       // ex.printStackTrace();
+                   logger.error("exception occured in loadProperties ", ex);
                } finally {
                        if (input != null) {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       // e.printStackTrace();
+                                   logger.error("exception occured in loadProperties ", e);
                                }
                        }
                }