Don't delete DB entries

This commit is contained in:
carbotaniuman 2020-07-04 10:27:43 -05:00
parent 13c372038e
commit 61e32327d6

View file

@ -163,23 +163,14 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
} else {
if (snapshot != null) {
snapshot.close()
if (LOGGER.isWarnEnabled) {
LOGGER.warn("Removing cache file for $sanitizedUri without corresponding DB entry")
}
cache.removeUnsafe(imageId.toCacheId())
}
if (imageDatum != null) {
if (LOGGER.isWarnEnabled) {
LOGGER.warn("Deleting DB entry for $sanitizedUri without corresponding file")
}
synchronized(database) {
transaction(database) {
imageDatum.delete()
}
}
}
request.handleCacheMiss(sanitizedUri, getRc4(rc4Bytes), imageId)
request.handleCacheMiss(sanitizedUri, getRc4(rc4Bytes), imageId, imageDatum)
}
}
}
@ -217,7 +208,7 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
}
}
private fun Request.handleCacheMiss(sanitizedUri: String, cipher: Cipher, imageId: String): Response {
private fun Request.handleCacheMiss(sanitizedUri: String, cipher: Cipher, imageId: String, imageDatum: ImageDatum?): Response {
if (LOGGER.isInfoEnabled) {
LOGGER.info("Request for $sanitizedUri missed cache")
}
@ -252,6 +243,7 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
LOGGER.trace("Request for $sanitizedUri is being cached and served")
}
if(imageDatum == null) {
synchronized(database) {
transaction(database) {
ImageDatum.new(imageId) {
@ -260,6 +252,7 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
}
}
}
}
val tee = CachingInputStream(
mdResponse.body.stream,