[Policy-24] Updated the Database Configuration

Change-Id: Ie358df4bfef5fb9cfe136f52a9d35f119c55bc97
Signed-off-by: rb7147 <rb7147@att.com>

3 files changed, 34 insertions, 12 deletions

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/HibernateSession.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/HibernateSession.java
index 2aca54cc7..e2fa702cb 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/HibernateSession.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/HibernateSession.java
@@ -48,7 +48,7 @@ public class HibernateSession{
 			configuration.setProperty("hibernate.connection.autocommit", "true");
 			configuration.setProperty("hibernate.c3p0.min_size", "5");
 			configuration.setProperty("hibernate.c3p0.max_size", "200");
-			configuration.setProperty("hibernate.c3p0.timeout", "3600");
+			configuration.setProperty("hibernate.c3p0.timeout", "2147483");
 			configuration.setProperty("hibernate.c3p0.idle_test_period", "3600");
 			configuration.setProperty("hibernate.cache.use.query_cache", "false");
 			configuration.setProperty("hibernate.cache.use_second_level_cache", "false");
diff --git a/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java b/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java
index 5ddb623c0..73ecf797e 100644
--- a/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java
+++ b/LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java
@@ -141,15 +141,19 @@ public class ParseLog {
 			             
 						if (debugfile.isFile()){
 							// log4jlogger must use .info
-							try (Stream<String> lines = Files.lines(debugfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + debuglastNumberRead)).skip(debuglastNumberRead)) {
-								
+							Stream<String> lines = null;
+							try {
+								lines = Files.lines(debugfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + debuglastNumberRead)).skip(debuglastNumberRead);
 								lines.forEachOrdered(line -> process(line, type, LOGTYPE.DEBUG));
-								lines.close();
 							} catch (IOException e) {
 								logger.error("Error processing line in " + dataFileName + ":" + e);
 								logger.error("break the loop.");
 								isStop = true;
-							}	
+							}finally{
+								if(lines != null){
+									lines.close();
+								}
+							}
 						}
 						try {
 							Thread.sleep(sleepTimer);
@@ -207,15 +211,19 @@ public class ParseLog {
 					while (!isStop){
 						if (errorfile.isFile()){
 							// log4jlogger must use .info
-							try (Stream<String> lines = Files.lines(errorfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + errorlastNumberRead)).skip(errorlastNumberRead)) {
-								
+							Stream<String> lines = null;
+							try{
+								lines = Files.lines(errorfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + errorlastNumberRead)).skip(errorlastNumberRead);
 								lines.forEachOrdered(line -> process(line, type, LOGTYPE.ERROR));
-								lines.close();
 							} catch (IOException e) {
 								logger.error("Error processing line in " + dataFileName + ":" + e);
 								logger.error("break the loop.");
 								isStop = true;
-							}	
+							}finally{
+								if(lines != null){
+									lines.close();
+								}
+							}
 						}
 						try {
 							Thread.sleep(sleepTimer);
@@ -271,14 +279,18 @@ public class ParseLog {
 						
 						if (file.isFile()){
 							// log4jlogger must use .info
-							try (Stream<String> lines = Files.lines(filePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + lastNumberRead)).skip(lastNumberRead)) {
-								
+							Stream<String> lines = null;;
+							try {
+								lines = Files.lines(filePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + lastNumberRead)).skip(lastNumberRead);
 								lines.forEachOrdered(line -> process(line, type, LOGTYPE.INFO));
-								lines.close();
 							} catch (IOException e) {
 								logger.error("Error processing line in " + dataFileName + ":" + e);
 								logger.error("break the loop.");
 								isStop = true;
+							}finally{
+								if(lines != null){
+									lines.close();
+								}
 							}	
 						}
 						try {
diff --git a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
index d7892c1bf..02a83159b 100755
--- a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
@@ -45,6 +45,16 @@ USE `ecomp_sdk`;
 set foreign_key_checks=0;
 
 --
+-- Increasing the Database variable timeouts
+--
+
+set global wait_timeout=2147483;   
+set global interactive_timeout=2147483;
+
+set wait_timeout=2147483;   
+set interactive_timeout=2147483;
+
+--
 -- Table structure for table `actionbodyentity`
 --