neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Added better error handling for spring environment issues

Browse Source
This commit is contained in:
neviyn 2019-03-04 11:45:40 +00:00
parent b72060cd2a
commit 707b8a1b26
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionController.kt
View File

@ -176,8 +176,15 @@ class GroupSessionController {
retryCount++ retryCount++
Thread.sleep(1_000) // Sleep for 1 second Thread.sleep(1_000) // Sleep for 1 second
} }
if (ipv4 != null) if (ipv4 != null && this::environment.isInitialized)
return mapOf("ip" to ipv4, "port" to environment["local.server.port"]) return mapOf("ip" to ipv4, "port" to environment["local.server.port"])
else if(ipv4 == null) {
logger.error("IP Address could not be determined")
return mapOf("error" to "Could not determine IP Address") return mapOf("error" to "Could not determine IP Address")
} }
else {
logger.error("Port could not be determined, environment not initialised")
return mapOf("error" to "Could not determine port")
}
}
} }

2
backend/src/test/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionControllerTest.kt
View File

@ -30,12 +30,10 @@ class GroupSessionControllerTest{
lateinit var siteRepository: SiteRepository lateinit var siteRepository: SiteRepository
@Mock @Mock
lateinit var tutorRepository: TutorRepository lateinit var tutorRepository: TutorRepository
/**
@Mock @Mock
lateinit var observationRepository: ObservationRepository lateinit var observationRepository: ObservationRepository
@Mock @Mock
lateinit var personRepository: PersonRepository lateinit var personRepository: PersonRepository
**/
@After @After
fun tearDown() { fun tearDown() {