statisticlogger dbcp connection pool

1 files changed, 30 insertions, 8 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
index a07099a93..67ad4762c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
@@ -46,6 +46,7 @@
 
 package at.gv.egovernment.moa.id.config;
 
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Properties;
 
@@ -53,6 +54,7 @@ import org.hibernate.cfg.Configuration;
 
 import at.gv.egovernment.moa.id.commons.api.ConfigurationProvider;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
+import at.gv.egovernment.moa.id.commons.config.SpringProfileConstants;
 import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
 import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
@@ -229,14 +231,14 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 					//MOASessionDBUtils.initHibernate(config, moaSessionProp);
 					
 					//initial advanced logging
-					if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
-						Logger.info("Advanced statistic log is activated, starting initialization process ...");
-						Configuration statisticconfig = new Configuration();
-						statisticconfig.addAnnotatedClass(StatisticLog.class);
-						statisticconfig.addProperties(statisticProps);
-						StatisticLogDBUtils.initHibernate(statisticconfig, statisticProps);
-						Logger.info("Advanced statistic log is initialized.");
-					}
+//					if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
+//						Logger.info("Advanced statistic log is activated, starting initialization process ...");
+//						Configuration statisticconfig = new Configuration();
+//						statisticconfig.addAnnotatedClass(StatisticLog.class);
+//						statisticconfig.addProperties(statisticProps);
+//						StatisticLogDBUtils.initHibernate(statisticconfig, statisticProps);
+//						Logger.info("Advanced statistic log is initialized.");
+//					}
 					
 				  }
 				Logger.trace("Hibernate initialization finished.");
@@ -271,6 +273,7 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 				eGovUtilsConfig = 
 						new EgovUtilPropertiesConfiguration(eGovUtilsConfigProp, rootConfigFileDir);
 			}
+			this.generateActiveProfiles(props);
 	
   }
 
@@ -281,5 +284,24 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
 	public EgovUtilPropertiesConfiguration geteGovUtilsConfig() {
 		return eGovUtilsConfig;
 	}
+	
+	private ArrayList<String> activeProfiles = new ArrayList<String>();
+	
+	public void generateActiveProfiles(Properties props){
+		if (Boolean.valueOf(props.getProperty("configuration.advancedlogging.active", "false"))) {
+			activeProfiles.add(SpringProfileConstants.ADVANCED_LOG);
+		}else{
+			activeProfiles.add("advancedLogOff");
+		}
+		if (Boolean.valueOf(props.getProperty("redis.active", "false"))) {
+			activeProfiles.add(SpringProfileConstants.REDIS_BACKEND);
+		}else{
+			activeProfiles.add(SpringProfileConstants.DB_BACKEND);
+		}
+	}
+	
+	public String[] getActiveProfiles(){
+		return activeProfiles.toArray(new String[0]);
+	}
   
 }