From 4d0920c40f6f8a0b4fda207244983a92bcfa6563 Mon Sep 17 00:00:00 2001 From: Torma Date: Thu, 22 Oct 2020 02:24:36 +0200 Subject: [PATCH] envvars and better structure --- src/Application.kt | 26 +++++++++++++++----------- src/Uploader.kt | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Application.kt b/src/Application.kt index 87134d5..5389e5c 100644 --- a/src/Application.kt +++ b/src/Application.kt @@ -19,22 +19,26 @@ fun Application.module(testing: Boolean = false) { val gson = GsonBuilder().setPrettyPrinting().create() val startTime = Instant.now() var elapsed = Duration.ofSeconds(0) - val targetTime = Duration.ofSeconds(10) + val targetTime = Duration.ofSeconds(System.getenv("WAITTIME").toLong()) var currIter = 1 val timestamps = LinkedHashMap() var currTimeStamp : Instant val uploader = Uploader() val processResults = ProcessResults() - println("Starting benchmark") - while(elapsed > targetTime){ - println(currIter) - uploader.uploadData(currIter, gson, cachedFile) - currIter+=1 - currTimeStamp = Instant.now() - timestamps[currIter] = currTimeStamp - elapsed = Duration.between(startTime, currTimeStamp) + environment.monitor.subscribe(ApplicationStarted) { + println("Starting benchmark") + val job = GlobalScope.launch { + while(elapsed > targetTime){ + println(currIter) + uploader.uploadData(currIter, gson, cachedFile) + currIter+=1 + currTimeStamp = Instant.now() + timestamps[currIter] = currTimeStamp + elapsed = Duration.between(startTime, currTimeStamp) + } + println("Benchmark ended") + processResults.process() + } } - println("Benchmark ended") - processResults.process() } } \ No newline at end of file diff --git a/src/Uploader.kt b/src/Uploader.kt index f2d0574..2b50956 100644 --- a/src/Uploader.kt +++ b/src/Uploader.kt @@ -34,7 +34,7 @@ class Uploader(){ } client.submitFormWithBinaryData(formData = parts) { - url("https://birb.k8s.kmlabz.com/benchmark") + url(System.getenv("URL") ?: "https://birb.k8s.kmlabz.com/benchmark") } } }