This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push: new c6ff0d1 SCB-1532 Supports akka resdis persistence configuration(#576) c6ff0d1 is described below commit c6ff0d197111dab80453d50172373bcec4bd1c32 Author: Fx_demon <fxde...@126.com> AuthorDate: Tue Oct 22 14:45:49 2019 +0800 SCB-1532 Supports akka resdis persistence configuration(#576) #redis 单机模式 #akkaConfig: # akka.persistence.journal.plugin: akka-persistence-redis.journal # akka.persistence.snapshot-store.plugin: akka-persistence-redis.snapshot # akka-persistence-redis: # redis: # mode: simple # host: ${spring.redis.host} # port: ${spring.redis.port} # database: 0 # #password: ${spring.redis.password} #redis 哨兵模式 akkaConfig: akka.persistence.journal.plugin: akka-persistence-redis.journal akka.persistence.snapshot-store.plugin: akka-persistence-redis.snapshot akka-persistence-redis: redis: mode: sentinel database: 1 password: ${spring.redis.password} master: ${spring.redis.sentinel.master} sentinel-list: ${spring.redis.sentinel.nodes} --- .../spring/integration/akka/AkkaConfigPropertyAdapter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/AkkaConfigPropertyAdapter.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/AkkaConfigPropertyAdapter.java index d364da7..566694d 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/AkkaConfigPropertyAdapter.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/AkkaConfigPropertyAdapter.java @@ -31,6 +31,7 @@ public class AkkaConfigPropertyAdapter { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); public static final String PROPERTY_SOURCE_NAME = "akkaConfig."; + public static final String REDIS_NAME = "akkaConfig.akka-persistence-redis.redis."; static final String AKKA_CLUSTER_SEED_NODES_KEY = "akka.cluster.seed-nodes"; static final String AKKA_ESTENSIONS_KEY = "akka.extensions"; static final String AKKA_LOGGERS_KEY = "akka.loggers"; @@ -58,7 +59,18 @@ public class AkkaConfigPropertyAdapter { if (LOG.isTraceEnabled()) { LOG.trace("Adding property {}={}" + key, value); } + propertyMap.put(key, value); + + if(name.startsWith(REDIS_NAME) && !propertyMap.containsKey(name)){ + String readJournalKey = ("akka-persistence-redis.read-journal.redis.").concat(name.substring(REDIS_NAME.length())); + String journalKey = ("akka-persistence-redis.journal.redis.").concat(name.substring(REDIS_NAME.length())); + String snapshotKey = ("akka-persistence-redis.snapshot.redis.").concat(name.substring(REDIS_NAME.length())); + propertyMap.put( readJournalKey, value); + propertyMap.put( journalKey, value); + propertyMap.put( snapshotKey, value); + } + } } }