Skip to content

Commit e3af440

Browse files
committed
refactor(Launcher): Replace CLI with environment variables
- Remove ktor-metrics
1 parent 938d056 commit e3af440

File tree

6 files changed

+17
-83
lines changed

6 files changed

+17
-83
lines changed

.gitignore

+8-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
.idea/**/uiDesigner.xml
2626
.idea/**/dbnavigator.xml
2727

28+
# Other IDEA releated files
29+
.idea/discord.xml
30+
.idea/jarRepositories.xml
31+
.idea/vcs.xml
32+
.idea/misc.xml
33+
2834
# Gradle
2935
.idea/**/gradle.xml
3036
.idea/**/libraries
@@ -77,7 +83,6 @@ fabric.properties
7783

7884
*.iml
7985
modules.xml
80-
.idea/misc.xml
8186
*.ipr
8287

8388
### Kotlin ###
@@ -124,4 +129,5 @@ gradle-app.setting
124129
### Gradle Patch ###
125130
**/build/
126131

127-
# End of https://www.gitignore.io/api/gradle,kotlin,intellij+iml
132+
# End of https://www.gitignore.io/api/gradle,kotlin,intellij+iml
133+
.idea/compiler.xml

.idea/discord.xml

-9
This file was deleted.

.idea/jarRepositories.xml

-40
This file was deleted.

.idea/vcs.xml

-6
This file was deleted.

build.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ repositories {
1919
mavenLocal()
2020
jcenter()
2121
maven("https://kotlin.bintray.com/ktor")
22-
maven("https://kotlin.bintray.com/kotlinx")
2322
maven("https://dl.bintray.com/excitement-engineer/ktor-graphql")
2423
}
2524

2625
dependencies {
2726

2827
// Ktor
2928
implementation("io.ktor", "ktor-server-netty", ktorVersion)
30-
implementation("io.ktor", "ktor-metrics", ktorVersion)
3129
implementation("io.ktor", "ktor-server-core", ktorVersion)
3230
implementation("io.ktor", "ktor-websockets", ktorVersion)
3331
implementation("io.ktor", "ktor-jackson", ktorVersion)
@@ -46,8 +44,6 @@ dependencies {
4644
implementation("io.sentry", "sentry-logback", "1.7.30")
4745

4846

49-
// Util
50-
implementation("org.jetbrains.kotlinx", "kotlinx-cli", "0.2.1")
5147

5248
// Kotlin
5349
implementation(kotlin("stdlib-jdk8"))

src/main/kotlin/app/ryss/gateway/Launcher.kt

+9-22
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,27 @@
11
package app.ryss.gateway
22

33
import app.ryss.gateway.core.GatewayService
4+
import ch.qos.logback.classic.Level
5+
import ch.qos.logback.classic.Logger
46
import io.ktor.server.engine.embeddedServer
57
import io.ktor.server.netty.Netty
68
import io.sentry.Sentry
7-
import kotlinx.cli.ArgParser
8-
import kotlinx.cli.ArgType
9-
import kotlinx.cli.default
109
import org.slf4j.LoggerFactory
11-
import ch.qos.logback.classic.Logger
12-
import ch.qos.logback.classic.Level
13-
import org.slf4j.event.Level as SLF4JLevel
1410

1511
/**
16-
* Application main entry point.
12+
* Gateway entry point.
1713
*/
18-
fun main(args: Array<String>) {
19-
val parser = ArgParser("gateway")
20-
val debug by parser.option(ArgType.Boolean, shortName = "d", fullName = "debug", description = "Enables debug mode")
21-
.default(false)
22-
val logLevel by parser.option(
23-
ArgType.Choice(SLF4JLevel.values().map(Any::toString)),
24-
shortName = "ll",
25-
fullName = "log-level",
26-
description = "Sets the log level"
27-
).default("INFO")
28-
val enableGraphiQL by parser.option(ArgType.Boolean, shortName = "giql", fullName = "graphiql", description = "Enabled graphiql").default(false)
29-
parser.parse(args)
14+
fun main() {
15+
val debug = System.getenv("ENVIRONMENT") == "DEVELOPMENT"
16+
val logLevel = Level.valueOf(System.getenv("GATEWAY_SERVICE_LOG_LEVEL"))
17+
val enableGraphiQL = System.getenv("GATEWAY_SERVICE_ENABLE_GRAPHQL") == "true"
3018

3119
val rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger
32-
rootLogger.level = Level.valueOf(logLevel)
20+
rootLogger.level = logLevel
3321

3422
if (!debug) {
3523
Sentry.init(
36-
"${System.getenv("GATEWAY_SERVICE_SENTRY_DSN")}?stacktrace" +
37-
".app.packages=app.ryss"
24+
"${System.getenv("GATEWAY_SERVICE_SENTRY_DSN")}?stacktrace.app.packages=app.ryss"
3825
)
3926
} else {
4027
Sentry.init()

0 commit comments

Comments
 (0)