branch develop-5.x created (now 826ea6c)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 826ea6c [maven] passage en maintenance This branch includes the following new commits: new ba50d32 refs #8554 : changement de la configuration du pool de connections new eb40fd5 fix cherry-pick new 826ea6c [maven] passage en maintenance The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 826ea6c9ba404188261781366060eac54595a531 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 13:59:44 2016 +0100 [maven] passage en maintenance commit eb40fd5958ac5f3788f7de2797766d8973234659 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 13:57:22 2016 +0100 fix cherry-pick 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 eb40fd5958ac5f3788f7de2797766d8973234659 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 13:57:22 2016 +0100 fix cherry-pick --- .../main/java/fr/ird/observe/ObserveTopiaApplicationContext.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index f329d0a..a48d0e6 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -105,13 +105,6 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat } @Override - public ObserveTopiaPersistenceContext newPersistenceContext() { - ObserveTopiaPersistenceContext persistenceContext = super.newPersistenceContext(); - persistenceContext.setShowSql(getConfiguration().isShowSql()); - return persistenceContext; - } - - @Override public ObserveTopiaConfiguration getConfiguration() { return (ObserveTopiaConfiguration) super.getConfiguration(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 826ea6c9ba404188261781366060eac54595a531 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 13:59:44 2016 +0100 [maven] passage en maintenance --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 430e4c1..7ee9ae8 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,9 @@ <!--Modèle version--> <observe.model.version>5.0</observe.model.version> + <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName> + <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName> + </properties> <repositories> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm