X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fdatabase%2FConnectionFactory.java;h=e32b8e0d6e15d047d5913a2812a2ab5d6b9bc587;hb=b7e64f754d6b2a5211a46a10182c631c799f66b4;hp=1d93d68b5a99a48c43e51eb8088fa94f37396eaf;hpb=0bff051a842b164b680bc938f4a56db435dd5841;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
index 1d93d68..e32b8e0 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
@@ -3,6 +3,7 @@
  * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +24,10 @@ package org.onap.dmaap.dbcapi.database;
 import java.sql.*;
 import java.util.*;
 
-import org.apache.log4j.Logger;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
-import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
+import java.util.concurrent.TimeUnit;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 public class ConnectionFactory	{
@@ -39,6 +38,7 @@ public class ConnectionFactory	{
 	 static final EELFLogger errorLogger = EELFManager.getInstance().getErrorLogger();
 	 static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
 	 static final EELFLogger serverLogger = EELFManager.getInstance().getServerLogger();
+	 static final int PREPARE_PSQL_CONNECTION_ATTEMPTS = 5;
 
 	static {
 		try {
@@ -52,12 +52,15 @@ public class ConnectionFactory	{
 	private String	dbname;
 	private String	dbuser;
 	private String	dbcr;
+	private String  schema;
+	
 	public ConnectionFactory() {
 		Properties p = DmaapConfig.getConfig();
 		host = p.getProperty("DB.host", "dcae-pstg-write-ftl.domain.notset.com");
 		dbname = p.getProperty("DB.name", "dmaap");
 		dbuser = p.getProperty("DB.user", "dmaap_admin");
 		dbcr = p.getProperty("DB.cred", "test234-ftl");
+		schema = p.getProperty("DB.schema", "public");
 	}
 	public static ConnectionFactory getDefaultInstance() {
 		return(instance);
@@ -75,8 +78,19 @@ public class ConnectionFactory	{
 		Properties p = new Properties();
 		p.put("user", dbuser);
 		p.put("password", dbcr);
+		for (int i=1; i<PREPARE_PSQL_CONNECTION_ATTEMPTS; i++){
+			try{
+				return(DriverManager.getConnection("jdbc:postgresql://" + host + "/" + dbname, p));
+			}catch(SQLException e){
+				logger.error("Unable to connect to the postgres server. " + i + "attempt failed. ", e);
+				waitFor(1);
+			}
+		}
 		return(DriverManager.getConnection("jdbc:postgresql://" + host + "/" + dbname, p));
 	}
+	public String getSchema() {
+		return(schema);
+	}
 	public void release(Connection c) {
 		synchronized(this) {
 			if (cur < pool.length) {
@@ -84,6 +98,18 @@ public class ConnectionFactory	{
 				return;
 			}
 		}
-		try { c.close(); } catch (Exception e) {}
+		try { 
+			c.close(); 
+		} catch (Exception e) {
+			logger.error("Error", e);
+		}
+	}
+	private void waitFor(long seconds){
+		try {
+			TimeUnit.SECONDS.sleep(seconds);
+		} catch (InterruptedException e) {
+			logger.debug("Waiting interrupted. ", e);
+			Thread.currentThread().interrupt();
+		}
 	}
 }