Skip to content

Commit 6ab3772

Browse files
authored
Merge pull request #452 from modelix/experiment/monitoring
MODELIX-720 Add ktor Micrometer monitoring endpoint
2 parents 2dd4605 + d0d0958 commit 6ab3772

File tree

15 files changed

+1946
-27
lines changed

15 files changed

+1946
-27
lines changed

bulk-model-sync-gradle-test/build.gradle.kts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,6 @@ kotlin {
7171
jvmToolchain(11)
7272
}
7373

74-
tasks.register("runModelServer", JavaExec::class) {
75-
group = "modelix"
76-
77-
description = "Launches a model-server instance to be used as a target for the test. " +
78-
"This task will block and is intended to be run in a separate process, apart from the actual test execution."
79-
80-
classpath = sourceSets["main"].runtimeClasspath
81-
mainClass.set("org.modelix.model.server.Main")
82-
args("-inmemory", "-port", "28309")
83-
}
84-
8574
val repoDir = project.layout.buildDirectory.dir("test-repo").get().asFile
8675

8776
val copyTestRepo by tasks.registering(Sync::class) {

bulk-model-sync-gradle-test/ci.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

33
set -e
4+
set -x
45

56
cd "$(dirname "$0")"
67

@@ -19,9 +20,12 @@ if [ "${CI}" != "true" ]; then
1920
}
2021
fi
2122

22-
./gradlew runModelServer --console=plain &
23+
cd ..
24+
./gradlew :model-server:run --console=plain --args="-inmemory -port 28309" &
2325
MODEL_SERVER_PID=$!
2426

27+
cd "$(dirname "$0")"
28+
2529
curl -X GET --retry 30 --retry-connrefused --retry-delay 1 http://localhost:28309/health
2630

2731
./gradlew runSyncTestPush --console=plain --stacktrace
276 KB
Loading

0 commit comments

Comments
 (0)