terribleplan/mangadex_at_home
1
0
Fork 0
forked from gitlab-com-mangadex-pub/mangadex_at_home
Code Issues Pull requests Releases Wiki Activity

Properly synchronised sqlite3 handler across threads

Browse source
This commit is contained in:
Amos Ng 2020-06-16 08:04:22 +08:00
parent 5b78da589e
commit 0afa1d2eaa
No known key found for this signature in database
GPG key ID: 89086414F634D123
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -30,8 +30,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [2020-06-14] Removed old cache subdirectory migration system by [@carbotaniuman]. - [2020-06-14] Removed old cache subdirectory migration system by [@carbotaniuman].
### Fixed ### Fixed
- [2020-06-15] Fixed tokenized data-saver parser not working by [@lflare].
- [2020-06-14] Switched cache metadata over to a MySql instance [@carbotaniuman]. - [2020-06-14] Switched cache metadata over to a MySql instance [@carbotaniuman].
- [2020-06-15] Fixed tokenized data-saver parser not working by [@lflare].
- [2020-06-15] Properly synchronised sqlite3 handler across threads by [@lflare].
## [1.0.0-RC16] - 2020-06-14 ## [1.0.0-RC16] - 2020-06-14
### Added ### Added

8
src/main/kotlin/mdnet/base/server/ImageServer.kt
View file

@ -77,9 +77,11 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
val imageId = printHexString(rc4Bytes) val imageId = printHexString(rc4Bytes)
val snapshot = cache.getUnsafe(imageId.toCacheId()) val snapshot = cache.getUnsafe(imageId.toCacheId())
val imageDatum = transaction(database) { val imageDatum = synchronized(database) {
transaction(database) {
ImageDatum.findById(imageId) ImageDatum.findById(imageId)
} }
}
if (snapshot != null && imageDatum != null) { if (snapshot != null && imageDatum != null) {
request.handleCacheHit(sanitizedUri, getRc4(rc4Bytes), snapshot, imageDatum) request.handleCacheHit(sanitizedUri, getRc4(rc4Bytes), snapshot, imageDatum)
@ -96,10 +98,12 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
if (LOGGER.isWarnEnabled) { if (LOGGER.isWarnEnabled) {
LOGGER.warn("Deleting DB entry for $sanitizedUri without corresponding file") LOGGER.warn("Deleting DB entry for $sanitizedUri without corresponding file")
} }
synchronized(database) {
transaction(database) { transaction(database) {
imageDatum.delete() imageDatum.delete()
} }
} }
}
request.handleCacheMiss(sanitizedUri, getRc4(rc4Bytes), imageId) request.handleCacheMiss(sanitizedUri, getRc4(rc4Bytes), imageId)
.header("X-Uri", sanitizedUri) .header("X-Uri", sanitizedUri)
@ -174,12 +178,14 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
LOGGER.trace("Request for $sanitizedUri is being cached and served") LOGGER.trace("Request for $sanitizedUri is being cached and served")
} }
synchronized(database) {
transaction(database) { transaction(database) {
ImageDatum.new(imageId) { ImageDatum.new(imageId) {
this.contentType = contentType this.contentType = contentType
this.lastModified = lastModified this.lastModified = lastModified
} }
} }
}
val tee = CachingInputStream( val tee = CachingInputStream(
mdResponse.body.stream, mdResponse.body.stream,