Remove scheduler. Add request and connection timeouts.

ReactiveCircus · Nov 25, 2023 · a1fdf7f · a1fdf7f
1 parent 26ff786
commit a1fdf7f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/KSBackendApplication.kt b/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/KSBackendApplication.kt
@@ -2,10 +2,8 @@ package io.github.reactivecircus.kstreamlined.backend
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
-import org.springframework.scheduling.annotation.EnableScheduling
 
 @SpringBootApplication
-@EnableScheduling
 class KSBackendApplication
 
 fun main(args: Array<String>) {

diff --git a/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/client/FeedClient.kt b/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/client/FeedClient.kt
@@ -12,6 +12,7 @@ import io.github.reactivecircus.kstreamlined.backend.client.dto.TalkingKotlinRss
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
@@ -63,6 +64,10 @@ class RealFeedClient(
             xml(format, ContentType.Application.Xml)
             xml(format, ContentType.Text.Xml)
         }
+        install(HttpTimeout) {
+            connectTimeoutMillis = HttpTimeoutMillis
+            requestTimeoutMillis = HttpTimeoutMillis
+        }
     }
 
     context(CacheContext<KotlinBlogItem>)
@@ -91,6 +96,10 @@ class RealFeedClient(
     override suspend fun loadKotlinWeeklyFeed(): List<KotlinWeeklyItem> = getFromCacheOrFetch {
         httpClient.get(clientConfigs.kotlinWeeklyFeedUrl).body<KotlinWeeklyRss>().channel.items
     }
+
+    companion object {
+        private const val HttpTimeoutMillis = 30_000L
+    }
 }
 
 context(CacheContext<T>)

diff --git a/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/client/dto/CommonDTOs.kt b/src/main/kotlin/io/github/reactivecircus/kstreamlined/backend/client/dto/CommonDTOs.kt
@@ -8,7 +8,6 @@ object Namespace {
     const val media = "http://search.yahoo.com/mrss/"
     const val content = "http://purl.org/rss/1.0/modules/content/"
     const val yt = "http://www.youtube.com/xml/schemas/2015"
-    const val dc = "http://purl.org/dc/elements/1.1/"
 }
 
 @Serializable

diff --git a/.../kotlin/io/github/reactivecircus/kstreamlined/backend/scheduling/ScheduledCacheRefresh.kt b/.../kotlin/io/github/reactivecircus/kstreamlined/backend/scheduling/ScheduledCacheRefresh.kt