This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ba50d325c85c5220432b8b4f42068856019dea0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 25 15:22:11 2016 +0100 refs #8554 : changement de la configuration du pool de connections --- .../observe/ObserveTopiaApplicationContext.java | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 3c87e9d..f329d0a 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.nuiton.topia.persistence.HibernateAvailableSettings; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.support.TopiaMetadataModelSupportImpl; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; @@ -48,6 +49,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Objects; +import java.util.Properties; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -64,8 +66,6 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat public static final String SQL_BATCH_SERVICE_NAME = "sqlBatch"; - public static final String DB_VERSION = "db.version"; - private static final String CREATE_SCHEMA_SCRIPT = "CREATE SCHEMA OBSERVE_COMMON;\n" + "CREATE SCHEMA OBSERVE_LONGLINE;\n" @@ -92,6 +92,23 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe", "Observe"); this.topiaSqlTablesFactory = new TopiaSqlTablesFactory(getMetadataModel(), this); this.observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get(); + + // La valeur par défaut dans ToPIA est 20 et c'est trop peu + //FIXME Il semblerait que l'export d'une marée consome une connection mais ne la rend pas + //FIXME On devrait du coup limiter le nombre de marées à exporter (200-300) + Properties properties = new Properties(); + properties.put(HibernateAvailableSettings.C3P0_MAX_SIZE, 500); + properties.put(HibernateAvailableSettings.C3P0_MAX_STATEMENTS, 500); + properties.put(HibernateAvailableSettings.C3P0_TIMEOUT, 100); + getHibernateProvider().getHibernateConfiguration().addProperties(properties); + + } + + @Override + public ObserveTopiaPersistenceContext newPersistenceContext() { + ObserveTopiaPersistenceContext persistenceContext = super.newPersistenceContext(); + persistenceContext.setShowSql(getConfiguration().isShowSql()); + return persistenceContext; } @Override @@ -107,10 +124,6 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat this.open = open; } - public ObserveMigrationConfigurationProvider getObserveMigrationConfigurationProvider() { - return observeMigrationConfigurationProvider; - } - public ObserveMigrationEngine getMigrationService() { return getServices(ObserveMigrationEngine.class).get(MIGRATION_SERVICE_NAME); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.