diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java index db2334114..95ec42d41 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java @@ -41,9 +41,9 @@ public class DbConnectionConfig { cpds.setJdbcUrl(dbPath); cpds.setUser(login); cpds.setPassword(password); - cpds.setInitialPoolSize(10); - cpds.setMinPoolSize(10); - cpds.setMaxPoolSize(30); + cpds.setInitialPoolSize(settings.getMinPoolSize()); + cpds.setMinPoolSize(settings.getMinPoolSize()); + cpds.setMaxPoolSize(settings.getMaxPoolSize()); int numHelperThreads = Runtime.getRuntime().availableProcessors() * 2; cpds.setNumHelperThreads(numHelperThreads); cpds.setCheckoutTimeout(timeoutSec * 1000); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java index f6e601f92..a9570df58 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java @@ -32,11 +32,12 @@ public class HazelcastConfiguration { @Bean public Config hazelCastConfig() { Config config = new Config(); - config.setInstanceName("instance"); + config.setInstanceName(hzSettings.getInstanceName()); config.setGroupConfig(new GroupConfig() .setName(hzSettings.getLogin()) .setPassword(hzSettings.getPassword()) ); + config.setManagementCenterConfig(new ManagementCenterConfig().setEnabled(false)); config.setProperty("hazelcast.shutdownhook.enabled", "true"); config.setProperty("hazelcast.logging.type", "slf4j"); config.setProperty("hazelcast.operation.call.timeout.millis", "600000"); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java index ce00f0dc5..69e87faf5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java @@ -49,7 +49,7 @@ public class PoolMapConfigs implements InitializingBean { private MapStoreConfig makeDefaultMapStoreConfig(MapLoader mapBean) { return new MapStoreConfig() .setImplementation(mapBean) - ;//todo config: .setWriteDelaySeconds(configRoot.getIMDG().getDbSyncSeconds()); + .setWriteDelaySeconds(settings.getHazelcast().getDbSyncSeconds()); } public ScheduledExecutorConfig makeDefaultScheduledExecutorConfig(String name) { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/DatabaseSettings.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/DatabaseSettings.java index 670bfde03..142bb531a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/DatabaseSettings.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/DatabaseSettings.java @@ -4,6 +4,8 @@ public class DatabaseSettings { private String login; private String password; private String url; + private int minPoolSize = 10; + private int maxPoolSize = 30; public String getLogin() { return login; @@ -28,4 +30,20 @@ public class DatabaseSettings { public void setUrl(String url) { this.url = url; } + + public int getMaxPoolSize() { + return maxPoolSize; + } + + public void setMaxPoolSize(int maxPoolSize) { + this.maxPoolSize = maxPoolSize; + } + + public int getMinPoolSize() { + return minPoolSize; + } + + public void setMinPoolSize(int minPoolSize) { + this.minPoolSize = minPoolSize; + } } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/HazelcastServerSettings.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/HazelcastServerSettings.java index ca9e63268..e88bc54f1 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/HazelcastServerSettings.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/element/HazelcastServerSettings.java @@ -9,6 +9,8 @@ public class HazelcastServerSettings { private String password; private List clusterMembers; private Integer backupCount; + private String instanceName = "instance"; + private Integer dbSyncSeconds = 10; public int getListenPort() { return listenPort; @@ -49,4 +51,20 @@ public class HazelcastServerSettings { public void setBackupCount(Integer backupCount) { this.backupCount = backupCount; } + + public String getInstanceName() { + return instanceName; + } + + public void setInstanceName(String instanceName) { + this.instanceName = instanceName; + } + + public Integer getDbSyncSeconds() { + return dbSyncSeconds; + } + + public void setDbSyncSeconds(Integer dbSyncSeconds) { + this.dbSyncSeconds = dbSyncSeconds; + } } diff --git a/clearing-parent/imdg/src/main/resources/application.properties b/clearing-parent/imdg/src/main/resources/application.properties index 5204d1790..a29c47e21 100644 --- a/clearing-parent/imdg/src/main/resources/application.properties +++ b/clearing-parent/imdg/src/main/resources/application.properties @@ -3,7 +3,11 @@ imdg.hazelcast.login=dev imdg.hazelcast.password=dev-pass imdg.hazelcast.cluster-members[0]=127.0.0.1 imdg.hazelcast.backup-count=3 +imdg.hazelcast.instance-name=instance +imdg.hazelcast.db-sync-seconds=10; imdg.database.login=clearing imdg.database.password=Aa111111 imdg.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=clearing_prod -#imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres?currentSchema=clearing_tester \ No newline at end of file +#imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres?currentSchema=clearing_tester +imdg.database.min-pool-size=10 +imdg.database.max-pool-size=30 \ No newline at end of file