Skip to content

Commit 8949a17

Browse files
committed
Simplify telemetry dependency injection
1 parent a345ffb commit 8949a17

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

telemetry/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
buildscript {
22
ext {
3-
kotlin_version = '1.3.0-rc-190'
3+
kotlin_version = '1.3.11'
44
junit_version = '5.2.0'
5-
koin_version = '1.0.1'
65
}
76

87
repositories {
98
jcenter()
109
maven { url = "https://plugins.gradle.org/m2/" }
11-
maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" } // FIXME
1210
}
1311
dependencies {
1412
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -23,7 +21,6 @@ sourceCompatibility = 1.8
2321

2422

2523
repositories {
26-
maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" } // FIXME
2724
}
2825

2926
dependencies {
@@ -36,7 +33,7 @@ dependencies {
3633
implementation project(':swerve')
3734

3835
// Logging
39-
compile 'io.github.microutils:kotlin-logging:1.5.9'
36+
compile 'io.github.microutils:kotlin-logging:1.6.10'
4037

4138
}
4239

@@ -56,4 +53,4 @@ task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
5653
from javadoc.destinationDir
5754
}
5855

59-
apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar
56+
apply from: "${rootDir}/gradle/publish.gradle" // needs to come after javadocJar

telemetry/src/main/kotlin/org/strykeforce/thirdcoast/telemetry/TelemetryController.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ import org.eclipse.jetty.server.handler.DefaultHandler
99
import org.eclipse.jetty.server.handler.HandlerList
1010
import org.strykeforce.thirdcoast.telemetry.grapher.ClientHandler
1111
import org.strykeforce.thirdcoast.telemetry.grapher.Subscription
12+
import java.net.DatagramSocket
1213
import java.net.Inet4Address
1314
import java.net.NetworkInterface
1415
import javax.servlet.http.HttpServletRequest
1516
import javax.servlet.http.HttpServletResponse
1617

17-
18+
private const val SERVER_PORT = 5800
19+
private const val CLIENT_PORT = 5801
1820
private const val JSON = "application/json"
1921
private const val GRAPHER = "/v1/grapher"
2022
private const val INVENTORY = "$GRAPHER/inventory"
@@ -77,6 +79,7 @@ class TelemetryController(
7779
private val port: Int
7880
) {
7981

82+
constructor(inventory: Inventory) : this(inventory, ClientHandler(CLIENT_PORT, DatagramSocket()), SERVER_PORT)
8083

8184
private val server = Server(port).apply {
8285
handler = HandlerList().apply {

telemetry/src/main/kotlin/org/strykeforce/thirdcoast/telemetry/grapher/ClientHandler.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ private val logger = KotlinLogging.logger {}
1313

1414
/** Handles data streaming with Grapher client. */
1515
class ClientHandler(private val port: Int, private val socket: DatagramSocket) {
16+
1617
private var scheduler: ScheduledExecutorService? = null
1718

1819
/**

0 commit comments

Comments
 (0)