Skip to content

Commit de946c4

Browse files
authored
Merge pull request #359 from wafflestudio/develop
Release
2 parents 20d723e + e32e9fb commit de946c4

File tree

1 file changed

+24
-5
lines changed
  • core/src/main/kotlin/common/cache

1 file changed

+24
-5
lines changed

core/src/main/kotlin/common/cache/Cache.kt

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,17 @@ class RedisCache(
5757
return objectMapper.readValue(it, typeRef)
5858
}
5959
} catch (e: Exception) {
60+
log.error("cache get error")
6061
log.error(e.message, e)
6162
}
6263

6364
if (supplier == null) return null
6465

6566
val value = supplier()
6667

67-
coroutineScope.launch { set(builtKey, value) }
68+
coroutineScope.launch {
69+
set(builtKey, value)
70+
}
6871

6972
return value
7073
}
@@ -78,26 +81,42 @@ class RedisCache(
7881

7982
log.debug("[CACHE SET] {}", builtKey.key)
8083
redisTemplate.opsForValue().setAndAwait(builtKey.key, redisValue, builtKey.ttl)
81-
} catch (_: Exception) {
84+
} catch (e: Exception) {
85+
log.error("cache set error")
86+
log.error(e.message, e)
8287
}
8388
}
8489

8590
override suspend fun delete(builtKey: BuiltCacheKey) {
8691
try {
8792
log.debug("[CACHE DEL] {}", builtKey.key)
8893
redisTemplate.deleteAndAwait(builtKey.key)
89-
} catch (_: Exception) {
94+
} catch (e: Exception) {
95+
log.error("cache delete error", e)
96+
log.error(e.message, e)
9097
}
9198
}
9299

93100
override suspend fun acquireLock(builtKey: BuiltCacheKey): Boolean {
94101
log.debug("[CACHE SETNX] {}", builtKey.key)
95-
return redisTemplate.opsForValue().setIfAbsentAndAwait(builtKey.key, "true", builtKey.ttl)
102+
return try {
103+
redisTemplate.opsForValue().setIfAbsentAndAwait(builtKey.key, "true", builtKey.ttl)
104+
} catch (e: Exception) {
105+
log.error("acquireLock error")
106+
log.error(e.message, e)
107+
false
108+
}
96109
}
97110

98111
override suspend fun releaseLock(builtKey: BuiltCacheKey): Boolean {
99112
log.debug("[CACHE DEL] {}", builtKey.key)
100-
return redisTemplate.deleteAndAwait(builtKey.key) > 0
113+
return try {
114+
redisTemplate.deleteAndAwait(builtKey.key) > 0
115+
} catch (e: Exception) {
116+
log.error("releaseLock error")
117+
log.error(e.message, e)
118+
false
119+
}
101120
}
102121
}
103122

0 commit comments

Comments
 (0)