From cef6e84e3731fcfd4842b5dbf87fa1b87e845fe0 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Mon, 18 Mar 2019 19:11:20 +0100 Subject: [PATCH] added request counter --- .../kotlin/org/mosad/thecitadelofricks/APIController.kt | 6 ++++++ src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt | 1 + 2 files changed, 7 insertions(+) diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt index e8d8d73..97b2c72 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt @@ -46,6 +46,7 @@ class APIController { // Controller stuff var logger: Logger = LoggerFactory.getLogger(APIController::class.java) + private var requestCount = 0 private val startTime = System.currentTimeMillis() / 1000 private val softwareVersion = "1.0.2" private val apiVersion = "1.0.1" @@ -90,12 +91,14 @@ class APIController { @RequestMapping("/courses") fun courses(): CoursesList { logger.info("courses request at ${LocalDateTime.now()}!") + requestCount++ return CoursesList(CoursesMeta(coursesLastUpdate, coursesLinkList.size), coursesLinkList) } @RequestMapping("/mensamenu") fun mensamenu(): Mensa { logger.info("mensamenu request at ${LocalDateTime.now()}!") + requestCount++ return Mensa(MensaMeta(mensaLastUpdate, mensaName), mensaCurrentWeek, mensaNextWeek) } @@ -105,6 +108,7 @@ class APIController { @RequestParam(value = "week", defaultValue = "0") week: Int ): TimetableCourseWeek { logger.info("timetable request at ${LocalDateTime.now()}!") + requestCount++ checkTimetableCourse(courseName, week) // check if we need to update and perform the update if so return timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.week == week }.findAny().orElse(null) } @@ -118,6 +122,7 @@ class APIController { var hsoCode = 999 var swfrCode = 999 logger.info("status request at ${LocalDateTime.now()}!") + requestCount++ try { val hsoURL = URL("https://www.hs-offenburg.de/") @@ -136,6 +141,7 @@ class APIController { "$days days, $hours:$minutes", apiVersion, softwareVersion, + requestCount, Date(coursesLastUpdate * 1000), Date(mensaLastUpdate * 1000), hsoCode, diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt index a4ce5e5..679dd7c 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt @@ -67,6 +67,7 @@ data class Status( val uptime: String, val apiVersion: String, val softwareVersion: String, + val requestCount: Int, val coursesLastUpdate: Date, val mensaLastUpdate: Date, val hsoResponseCode: Int,