Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56c6fef178 | ||
|
|
46b1b32708 | ||
|
|
519101023c | ||
|
|
82b4f51390 | ||
|
|
3256939ac7 | ||
|
|
02e4c5318d | ||
|
|
f06abd2838 | ||
|
|
f0297f2d2c | ||
|
|
ec23bd4d32 | ||
|
|
bab1892673 | ||
|
|
247fe83caa | ||
|
|
5fe6165373 | ||
|
|
64a8f17e6e |
+2
@@ -1,6 +1,7 @@
|
||||
package de.twomartens.wahlrecht.configuration
|
||||
|
||||
import de.twomartens.wahlrecht.property.ServiceProperties
|
||||
import org.springframework.cloud.context.config.annotation.RefreshScope
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import java.time.Clock
|
||||
@@ -9,6 +10,7 @@ import java.time.Clock
|
||||
open class ClockConfiguration(private val serviceProperties: ServiceProperties) {
|
||||
|
||||
@Bean
|
||||
@RefreshScope
|
||||
open fun clock(): Clock {
|
||||
return Clock.system(serviceProperties.defaultTimeZone)
|
||||
}
|
||||
|
||||
@@ -2,11 +2,10 @@ package de.twomartens.wahlrecht.property
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties
|
||||
import org.springframework.boot.context.properties.bind.ConstructorBinding
|
||||
import org.springframework.cloud.context.config.annotation.RefreshScope
|
||||
import java.time.ZoneId
|
||||
|
||||
@RefreshScope
|
||||
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
|
||||
@Schema(description = "Properties, to configure this Application")
|
||||
data class ServiceProperties @ConstructorBinding constructor(val defaultTimeZone: ZoneId, val greeting: String)
|
||||
data class ServiceProperties(var defaultTimeZone: ZoneId, var greeting: String)
|
||||
|
||||
-41
@@ -1,41 +0,0 @@
|
||||
package de.twomartens.wahlrecht.service
|
||||
|
||||
import mu.KotlinLogging
|
||||
import org.apache.logging.log4j.message.StringMapMessage
|
||||
import org.springframework.beans.factory.annotation.Qualifier
|
||||
import org.springframework.cloud.context.refresh.ContextRefresher
|
||||
import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
/**
|
||||
* automatically reloads application*.yaml. reload can also be triggered manually by doing a post
|
||||
* request on http://localhost:12001/actuator/refresh
|
||||
*/
|
||||
@Service
|
||||
class PropertyReloadService(@Qualifier("configDataContextRefresher") private val contextRefresher: ContextRefresher) {
|
||||
@Scheduled(
|
||||
fixedDelay = REFRESH_SECONDS.toLong(),
|
||||
initialDelay = REFRESH_SECONDS.toLong(),
|
||||
timeUnit = TimeUnit.SECONDS
|
||||
)
|
||||
fun refresh() {
|
||||
val properties = contextRefresher.refresh()
|
||||
if (properties.isNotEmpty()) {
|
||||
log.info(
|
||||
StringMapMessage()
|
||||
.with(PARAM_MESSAGE, "properties changed")
|
||||
.with(PARAM_PROPERTIES, properties.joinToString("\n"))
|
||||
.asString()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val REFRESH_SECONDS = 60
|
||||
const val PARAM_MESSAGE = "message"
|
||||
const val PARAM_PROPERTIES = "labels.properties"
|
||||
|
||||
private val log = KotlinLogging.logger {}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
spring:
|
||||
config:
|
||||
import:
|
||||
- "classpath:config/wahlrecht.yaml"
|
||||
- "optional:configserver:http://configserver:8888/config"
|
||||
- "configserver:http://configserver:8888/config"
|
||||
kafka:
|
||||
bootstrap-servers:
|
||||
- kafka:9092
|
||||
|
||||
@@ -38,6 +38,8 @@ spring:
|
||||
resourceserver:
|
||||
jwt:
|
||||
jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
|
||||
application:
|
||||
name: wahlrecht
|
||||
|
||||
springdoc:
|
||||
swagger-ui:
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
de.twomartens.wahlrecht:
|
||||
greeting: "Moin %s, you are great"
|
||||
greeting: "Moin %s, you are stage"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
de.twomartens.wahlrecht:
|
||||
defaultTimeZone: Europe/Berlin
|
||||
greeting: "Hello %s"
|
||||
greeting: "Hello %s, on millenium"
|
||||
statusprobe:
|
||||
scheduleDuration: 60
|
||||
maxKafkaFailureDuration: 5
|
||||
|
||||
Reference in New Issue
Block a user