Merge "Removed unused imports and log file"

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..b7236d8
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,42 @@
+---
+project: 'dmaap-messagerouter-mirroragent'
+project_creation_date: '2017-08-29'
+lifecycle_state: 'Incubation'
+project_lead: &onap_releng_ptl
+    name: 'Ram Koya'
+    email: 'rk541m@att.com'
+    id: 'rampi_k'
+    company: 'ATT'
+    timezone: 'America/Dallas'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/DMAAP'
+    key: 'DMAAP'
+meetings:
+    - type: 'zoom'
+        agenda: ''
+        url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275'
+        server: 'n/a'
+        channel: 'n/a'
+        repeats: 'weekly'
+        time: '13:00 UTC'
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Ramdas Sawant'
+        email: 'rs873m@att.com'
+        company: 'ATT'
+        id: 'rs873m'
+        timezone: 'America/Dallas'
+    - name: 'Varun Gudisena'
+        email: 'vg411h@att.com'
+        company: 'ATT'
+        id: 'vg411h'
+        timezone: 'America/Dallas'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Removal'
+          name: 'Habib Madani'
+          name: 'Xinhui Li'
+          name: 'Jing Wang'

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..2252992 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
@@ -103,7 +103,7 @@ public class MirrorMakerAgent {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                       logger.error("exception occured in checkStartup "+e);
                                }
                        }
                }
@@ -120,7 +120,7 @@ public class MirrorMakerAgent {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                       logger.error("exception occured in checkStartup "+e);
                                }
                        }
                }
@@ -168,7 +168,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 +182,7 @@ public class MirrorMakerAgent {
                                try {
                                        out.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                       logger.error("exception occured in checkPropertiesFile "+e);
                                }
                        }
                }

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 21a3974..9fe80db 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
@@ -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;
        }