Commit 1a7ac250 authored by Matt Wise's avatar Matt Wise
Browse files

Merge remote-tracking branch 'origin/dev' into aws-integration

parents f5b384ae 8770d6da
Pipeline #61227 failed with stages
in 46 minutes and 32 seconds
......@@ -57,7 +57,7 @@ public class CursorCacheImpl implements CursorCache {
* @param INDEX_CACHE_EXPIRATION - the expiration time for the Cursor Cache Redis cluster.
*/
public CursorCacheImpl() throws K8sParameterNotFoundException, JsonProcessingException {
int expTimeSeconds = Integer.parseInt(INDEX_CACHE_EXPIRATION) * 60;
int expTimeSeconds = 60*60;
K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
if (provider.getLocalMode()){
if (Boolean.parseBoolean(System.getenv("DISABLE_CACHE"))){
......
......@@ -46,7 +46,7 @@ public class FieldTypeMappingCacheImpl implements IFieldTypeMappingCache {
*
*/
public FieldTypeMappingCacheImpl() throws K8sParameterNotFoundException, JsonProcessingException {
int expTimeSeconds = Integer.parseInt(INDEX_CACHE_EXPIRATION) * 60;
int expTimeSeconds = 60 * 60;
K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
if (provider.getLocalMode()){
......
......@@ -41,7 +41,7 @@ public class IndexCacheImpl implements IIndexCache<String, Boolean>, AutoCloseab
private ICache<String, Boolean> cache;
private Boolean local;
public IndexCacheImpl(@Value("${aws.elasticache.cluster.index.expiration}") final String INDEX_CACHE_EXPIRATION) throws K8sParameterNotFoundException, JsonProcessingException {
int expTimeSeconds = Integer.parseInt(INDEX_CACHE_EXPIRATION) * 60;
int expTimeSeconds = 60 * 60;
K8sLocalParameterProvider provider = new K8sLocalParameterProvider();
if (provider.getLocalMode()){
if (Boolean.parseBoolean(System.getenv("DISABLE_CACHE"))){
......
......@@ -21,14 +21,14 @@ logging.level.org.springframework.web=${LOG_LEVEL:INFO}
server.port=${APPLICATION_PORT:8080}
## AWS ElastiCache configuration
aws.elasticache.cluster.cursor.endpoint=${CACHE_CLUSTER_ENDPOINT}
aws.elasticache.cluster.cursor.port=${CACHE_CLUSTER_PORT}
aws.elasticache.cluster.cursor.key=${CACHE_CLUSTER_KEY}
aws.elasticache.cluster.cursor.endpoint=${CACHE_CLUSTER_ENDPOINT:null}
aws.elasticache.cluster.cursor.port=${CACHE_CLUSTER_PORT:null}
aws.elasticache.cluster.cursor.key=${CACHE_CLUSTER_KEY:null}
aws.elasticache.cluster.cursor.expiration=60
aws.elasticache.cluster.index.endpoint=${CACHE_CLUSTER_ENDPOINT}
aws.elasticache.cluster.index.port=${CACHE_CLUSTER_PORT}
aws.elasticache.cluster.index.endpoint=${CACHE_CLUSTER_ENDPOINT:null}
aws.elasticache.cluster.index.port=${CACHE_CLUSTER_PORT:null}
aws.elasticache.cluster.index.expiration=60
aws.elasticache.cluster.index.key=${CACHE_CLUSTER_KEY}
aws.elasticache.cluster.index.key=${CACHE_CLUSTER_KEY:null}
## Default Elasticsearch Settings
aws.es.host=${ELASTIC_HOST:}
aws.es.port=${ELASTIC_PORT:0}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment