Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Session config #158

Merged
merged 7 commits into from
Dec 18, 2023
Merged

Session config #158

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8338249
session expiration configurable
rpassas Nov 28, 2023
e6d0f70
Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.validator-w…
rpassas Nov 28, 2023
291e125
create service function
rpassas Dec 6, 2023
e9eeba2
adding PassiveExpiringSessionCache
rpassas Dec 8, 2023
fb76bd8
Match renamed method
dotasek Dec 11, 2023
c148ff9
Merge branch 'master' into sessionConfig
rpassas Dec 15, 2023
e3f2031
Bump to current core SNAPSHOT
dotasek Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ kotlin.code.style=official
kotlin.js.generate.executable.default=false

# versions
fhirCoreVersion=6.2.4
fhirCoreVersion=6.2.6-SNAPSHOT

junitVersion=5.7.1
mockk_version=1.10.2
Expand Down
2 changes: 1 addition & 1 deletion src/jvmMain/kotlin/controller/validation/ValidationControllerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controller.validation

import model.ValidationResponse
import org.hl7.fhir.validation.cli.utils.VersionUtil
import org.hl7.fhir.utilities.VersionUtil
import org.hl7.fhir.validation.cli.model.ValidationRequest
import org.hl7.fhir.validation.cli.services.ValidationService
import org.koin.core.component.KoinComponent
Expand Down
19 changes: 16 additions & 3 deletions src/jvmMain/kotlin/controller/validation/ValidationServiceFactoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
package controller.validation

import java.util.concurrent.TimeUnit;

import org.hl7.fhir.validation.cli.services.ValidationService
import org.hl7.fhir.validation.cli.services.SessionCache

private const val MIN_FREE_MEMORY = 250000000
private const val SESSION_DEFAULT_DURATION: Long = 60

class ValidationServiceFactoryImpl : ValidationServiceFactory {
private val sessionCacheDuration: Long
private var sessionCache: SessionCache
private var validationService: ValidationService

private var validationService = ValidationService();

init {
sessionCacheDuration = System.getenv("SESSION_CACHE_DURATION")?.toLong() ?: SESSION_DEFAULT_DURATION;
sessionCache = SessionCache(sessionCacheDuration, TimeUnit.MINUTES);
sessionCache.setExpirationAfterAccess(true);
validationService = ValidationService(sessionCache);
}

override fun getValidationService() : ValidationService {

if (java.lang.Runtime.getRuntime().freeMemory() < MIN_FREE_MEMORY) {
println("Free memory ${java.lang.Runtime.getRuntime().freeMemory()} is less than ${MIN_FREE_MEMORY}. Re-initializing validationService");
validationService = ValidationService();
sessionCache = SessionCache(sessionCacheDuration, TimeUnit.MINUTES);
sessionCache.setExpirationAfterAccess(true);
validationService = ValidationService(sessionCache);
}
return validationService;
}
Expand Down
Loading