Various improvements #17
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
package org.mosad.thecitadelofricks.controller
|
package org.mosad.thecitadelofricks.controller
|
||||||
|
|
||||||
import org.mosad.thecitadelofricks.controller.StatusController.Companion.getTotalRequests
|
import org.mosad.thecitadelofricks.controller.StatusController.Companion.totalRequests
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
import java.io.BufferedReader
|
import java.io.BufferedReader
|
||||||
|
@ -42,8 +42,8 @@ class CachetAPIController {
|
||||||
fun postTotalRequests() {
|
fun postTotalRequests() {
|
||||||
try {
|
try {
|
||||||
val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
|
val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
|
||||||
val jsonInputString = "{\"value\": ${getTotalRequests() -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
|
val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
|
||||||
oldTotalRequests = getTotalRequests()
|
oldTotalRequests = totalRequests
|
||||||
|
|
||||||
val con = url.openConnection() as HttpURLConnection
|
val con = url.openConnection() as HttpURLConnection
|
||||||
con.requestMethod = "POST"
|
con.requestMethod = "POST"
|
||||||
|
|
|
@ -39,10 +39,14 @@ class StatusController {
|
||||||
companion object {
|
companion object {
|
||||||
private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
|
private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
|
||||||
|
|
||||||
private var totalRequests = 0
|
var totalRequests = 0
|
||||||
private var mensaMenuRequests = 0
|
private set
|
||||||
private var courseListRequests = 0
|
var mensaMenuRequests = 0
|
||||||
private var timetableRequests = HashMap<String, Int>()
|
private set
|
||||||
|
var courseListRequests = 0
|
||||||
|
private set
|
||||||
|
var timetableRequests = HashMap<String, Int>()
|
||||||
|
private set
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* if a mensamenu/courseList/timetable is requested update the specific and total request count
|
* if a mensamenu/courseList/timetable is requested update the specific and total request count
|
||||||
|
@ -62,25 +66,6 @@ class StatusController {
|
||||||
totalRequests++
|
totalRequests++
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* getters and setters
|
|
||||||
*/
|
|
||||||
fun getTotalRequests(): Int {
|
|
||||||
return totalRequests
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getMensaMenuRequests(): Int {
|
|
||||||
return mensaMenuRequests
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getCourseListRequests(): Int {
|
|
||||||
return courseListRequests
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getTimetableRequests(): HashMap<String, Int> {
|
|
||||||
return timetableRequests
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getStatus(): Status {
|
fun getStatus(): Status {
|
||||||
val currentTime = System.currentTimeMillis() / 1000
|
val currentTime = System.currentTimeMillis() / 1000
|
||||||
val minutes = (currentTime - startTime) % 3600 / 60
|
val minutes = (currentTime - startTime) % 3600 / 60
|
||||||
|
@ -112,10 +97,10 @@ class StatusController {
|
||||||
"$days days, $hours:$minutes",
|
"$days days, $hours:$minutes",
|
||||||
apiVersion,
|
apiVersion,
|
||||||
softwareVersion,
|
softwareVersion,
|
||||||
getTotalRequests(),
|
totalRequests,
|
||||||
getMensaMenuRequests(),
|
mensaMenuRequests,
|
||||||
getCourseListRequests(),
|
courseListRequests,
|
||||||
getTimetableRequests(),
|
timetableRequests,
|
||||||
CacheController.timetableList.size,
|
CacheController.timetableList.size,
|
||||||
Date(CacheController.courseList.meta.updateTime * 1000),
|
Date(CacheController.courseList.meta.updateTime * 1000),
|
||||||
Date(CacheController.mensaMenu.meta.updateTime * 1000),
|
Date(CacheController.mensaMenu.meta.updateTime * 1000),
|
||||||
|
|
Loading…
Reference in New Issue