added initial delay for scheduled updates

This commit is contained in:
Jannik 2019-03-18 16:13:13 +01:00
parent 08b6b2603f
commit cf0327bc88
4 changed files with 12 additions and 6 deletions

View File

@ -39,4 +39,4 @@ compileTestKotlin {
} }
group 'org.mosad' group 'org.mosad'
version '1.0.1' version '1.0.2'

View File

@ -47,6 +47,7 @@ class APIController {
// Controller stuff // Controller stuff
var logger: Logger = LoggerFactory.getLogger(APIController::class.java) var logger: Logger = LoggerFactory.getLogger(APIController::class.java)
private val startTime = System.currentTimeMillis() / 1000 private val startTime = System.currentTimeMillis() / 1000
private val softwareVersion = "1.0.2"
private val apiVersion = "1.0.1" private val apiVersion = "1.0.1"
// hso parser links (hardcoded) // hso parser links (hardcoded)
@ -66,19 +67,22 @@ class APIController {
init { init {
initUpdates() // without this 5-10 seconds after startup the response will be empty initUpdates() // without this 5-10 seconds after startup the response will be empty
// TODO we could use a first time delay val currentTime = System.currentTimeMillis()
val delay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
val delay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
// update courses every 24 hours (time in ms) // update courses every 24 hours (time in ms)
Timer().scheduleAtFixedRate(0, 86400000) { Timer().scheduleAtFixedRate(delay24h, 86400000) {
asyncUpdateCourses() asyncUpdateCourses()
} }
// update courses every 3 hours (time in ms) // update courses every 3 hours (time in ms)
Timer().scheduleAtFixedRate(0, 10800000) { Timer().scheduleAtFixedRate(delay3h, 10800000) {
asyncUpdateMensa() asyncUpdateMensa()
} }
// update all already existing timetables every 3 hours (time in ms) // update all already existing timetables every 3 hours (time in ms)
Timer().scheduleAtFixedRate(0, 10800000) { Timer().scheduleAtFixedRate(delay3h, 10800000) {
asyncUpdateTimetables() asyncUpdateTimetables()
} }
} }
@ -131,6 +135,7 @@ class APIController {
LocalDateTime.now(), LocalDateTime.now(),
"$days days, $hours:$minutes", "$days days, $hours:$minutes",
apiVersion, apiVersion,
softwareVersion,
Date(coursesLastUpdate * 1000), Date(coursesLastUpdate * 1000),
Date(mensaLastUpdate * 1000), Date(mensaLastUpdate * 1000),
hsoCode, hsoCode,

View File

@ -66,6 +66,7 @@ data class Status(
val time: LocalDateTime, val time: LocalDateTime,
val uptime: String, val uptime: String,
val apiVersion: String, val apiVersion: String,
val softwareVersion: String,
val coursesLastUpdate: Date, val coursesLastUpdate: Date,
val mensaLastUpdate: Date, val mensaLastUpdate: Date,
val hsoResponseCode: Int, val hsoResponseCode: Int,

View File

@ -61,7 +61,7 @@ class TimetableParser {
// adjust the following slot // adjust the following slot
sDay++ sDay++
sLesson = Lesson( sLesson = Lesson(
"$day.$rowIndex.$elementIndex", "$day.$rowIndex.$elementIndex", // FIXME this is broken!
element.select("div.lesson-subject").text(), element.select("div.lesson-subject").text(),
element.select("div.lesson-teacher").text(), element.select("div.lesson-teacher").text(),
element.select("div.lesson-room").text(), element.select("div.lesson-room").text(),