Adjusted ui
This commit is contained in:
parent
18d72c4159
commit
58d5fbc1e3
@ -55,12 +55,20 @@ class ApiCommunicationConfig {
|
||||
|
||||
@Bean
|
||||
fun coordinatorTemplate(): RestTemplate {
|
||||
return try {
|
||||
val url = UIEnv.coordinatorUrl
|
||||
require(url.isNotBlank()) { "UIEnv.coordinatorUrl er ikke satt!" }
|
||||
|
||||
val restTemplate = RestTemplate()
|
||||
restTemplate.uriTemplateHandler = DefaultUriBuilderFactory(UIEnv.coordinatorUrl)
|
||||
return restTemplate
|
||||
restTemplate.uriTemplateHandler = DefaultUriBuilderFactory(url)
|
||||
restTemplate
|
||||
} catch (e: Exception) {
|
||||
throw IllegalStateException("Feil ved opprettelse av coordinatorTemplate: ${e.message}", e)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Configuration
|
||||
class SocketImplemented: SocketImplementation() {
|
||||
|
||||
@ -4,5 +4,5 @@ import java.io.File
|
||||
|
||||
object UIEnv {
|
||||
val socketEncoder: String = if (System.getenv("EncoderWs").isNullOrBlank()) System.getenv("EncoderWs") else "ws://encoder:8080"
|
||||
val coordinatorUrl: String = if (System.getenv("Coordinator").isNullOrBlank()) System.getenv("Coordinator") else "http://coordinator"
|
||||
val coordinatorUrl: String = System.getenv("Coordinator")?.takeIf { it.isNotBlank() } ?: "http://coordinator"
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user