From: Ram Koya <rk541m@att.com>
Date: Wed, 16 Jan 2019 22:31:05 +0000 (+0000)
Subject: Merge changes from topics 'cghosh-4jan-sonarfix', 'cghosh-4jan-sonar-fix'
X-Git-Tag: 1.1.1~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=commitdiff_plain;h=62fa4be52b40c4587d2e53201ecf1f63bf424287;hp=-c

Merge changes from topics 'cghosh-4jan-sonarfix', 'cghosh-4jan-sonar-fix'

* changes:
  Added logger for exception block
  Added logger for exception log
---

62fa4be52b40c4587d2e53201ecf1f63bf424287
diff --combined src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java
index de19474,23fd99f..304a067
--- 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 +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 +100,7 @@@
  	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 +111,7 @@@
  				try {
  					input.close();
  				} catch (IOException e) {
- 					e.printStackTrace();
+ 					logger.error("exception occured in checkStartup "+e);
  				}
  			}
  		}
@@@ -128,7 -128,7 +128,7 @@@
  				try {
  					input.close();
  				} catch (IOException e) {
- 					e.printStackTrace();
+ 					logger.error("exception occured in checkStartup "+e);
  				}
  			}
  		}
@@@ -176,7 -176,7 +176,7 @@@
  				prop.store(out, "");
  
  			} catch (Exception e) {
- 				e.printStackTrace();
+ 				logger.error("exception occured in checkPropertiesFile "+e);
  			}
  		} finally {
  			if (input != null) {
@@@ -190,7 -190,7 +190,7 @@@
  				try {
  					out.close();
  				} catch (IOException e) {
- 					e.printStackTrace();
+ 					logger.error("exception occured in checkPropertiesFile "+e);
  				}
  			}
  		}
diff --combined src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java
index 37e0981,5246ce9..9fe80db
--- 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 +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 +97,7 @@@
  			//	}
  			}
  		} catch (Exception e) {
- 			e.printStackTrace();
+ 			logger.error("Error occured in MirrorMakerProcessHandler.checkMirrorMakerProcess"+e);
  		}
  		return false;
  	}