Merge pull request #534 from salesforce/or-koren-patch-2

W-13497368
salesforce · Jun 1, 2023 · 2e6f982 · 2e6f982
2 parents fda066f + 1879d8d
commit 2e6f982
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/...rmill-local/src/main/java/com/datorama/oss/timbermill/common/cache/RedisCacheHandler.java b/...rmill-local/src/main/java/com/datorama/oss/timbermill/common/cache/RedisCacheHandler.java
@@ -23,6 +23,9 @@ public class RedisCacheHandler extends AbstractCacheHandler {
     private JedisLock lock;
     private final RedisService redisService;
     private final int redisTtlInSeconds;
+
+    private int orphanRedisTTLRedisTTLInSeconds;
+    private int cacheRedisTTLRedisTTLInSeconds;
 
 
     RedisCacheHandler(RedisService redisService, int cacheRedisTtlInSeconds) {
@@ -31,6 +34,9 @@ public class RedisCacheHandler extends AbstractCacheHandler {
         }
         this.redisService = redisService;
         this.redisTtlInSeconds = cacheRedisTtlInSeconds;
+        orphanRedisTTLRedisTTLInSeconds = System.getenv("ORPHANS_REDIS_TTL_SECONDS") != null ? Integer.parseInt(System.getenv("ORPHANS_REDIS_TTL_SECONDS")) : cacheRedisTtlInSeconds;
+        cacheRedisTTLRedisTTLInSeconds = System.getenv("CACHE_REDIS_TTL_SECONDS") != null ? Integer.parseInt(System.getenv("CACHE_REDIS_TTL_SECONDS")) : cacheRedisTtlInSeconds;
+        LOG.info("Initializing Timbermill Redis Cache with orphanRedisTTLRedisTTLInSeconds {} seconds and cacheRedisTTLRedisTTLInSeconds {}", orphanRedisTTLRedisTTLInSeconds, cacheRedisTTLRedisTTLInSeconds);
     }
 
     @Override
@@ -53,8 +59,8 @@ public void pushToOrphanCache(Map<String, List<String>> orphansMap) {
             String orphanCacheKey = ORPHAN_PREFIX + entry.getKey();
             newOrphansMap.put(orphanCacheKey, entry.getValue());
         }
-        final int ttlToUse = System.getenv("ORPHANS_REDIS_TTL_SECONDS") != null ? Integer.parseInt(System.getenv("ORPHANS_REDIS_TTL_SECONDS")) : redisTtlInSeconds;
-        if (!redisService.pushToRedis(newOrphansMap, ttlToUse)){
+
+        if (!redisService.pushToRedis(newOrphansMap, orphanRedisTTLRedisTTLInSeconds)){
             LOG.error("Failed to push some ids to Redis orphans cache.");
             KamonConstants.ORPHAN_CACHE_FAILED_COUNTER.withoutTags().increment();
         }
@@ -67,8 +73,7 @@ public Map<String, LocalTask> getFromTasksCache(Collection<String> idsList) {
 
     @Override
     public void pushToTasksCache(Map<String, LocalTask> idsToMap) {
-        final int ttlToUse = System.getenv("CACHE_REDIS_TTL_SECONDS") != null ? Integer.parseInt(System.getenv("CACHE_REDIS_TTL_SECONDS")) : redisTtlInSeconds;
-        boolean allPushed = redisService.pushToRedis(idsToMap, ttlToUse);
+        boolean allPushed = redisService.pushToRedis(idsToMap, cacheRedisTTLRedisTTLInSeconds);
         if (!allPushed){
             LOG.error("Failed to push some ids to Redis tasks cache.");
         }