From f795e5184533ad63396cd290dc6835dd78d28ebd Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Fri, 14 Jun 2024 01:44:54 +0900 Subject: [PATCH] dotenv error fix(ignoreIfMissing=true) --- Dockerfile | 1 + src/main/kotlin/space/mori/chzzk_bot/Connector.kt | 4 ---- src/main/kotlin/space/mori/chzzk_bot/Main.kt | 4 +++- src/main/kotlin/space/mori/chzzk_bot/chzzk/Connector.kt | 3 +-- src/main/kotlin/space/mori/chzzk_bot/discord/Discord.kt | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48d4e75..ccf36a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ FROM alpine:3.13 WORKDIR /app +# https://stackoverflow.com/a/77779723/11516704 RUN apk add gcompat # Copy the executable from the build stage diff --git a/src/main/kotlin/space/mori/chzzk_bot/Connector.kt b/src/main/kotlin/space/mori/chzzk_bot/Connector.kt index e4a711e..4c035f9 100644 --- a/src/main/kotlin/space/mori/chzzk_bot/Connector.kt +++ b/src/main/kotlin/space/mori/chzzk_bot/Connector.kt @@ -2,16 +2,12 @@ package space.mori.chzzk_bot import com.zaxxer.hikari.HikariConfig import com.zaxxer.hikari.HikariDataSource -import io.github.cdimascio.dotenv.dotenv import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.SchemaUtils import org.jetbrains.exposed.sql.transactions.transaction -import org.slf4j.LoggerFactory import space.mori.chzzk_bot.models.* object Connector { - private val dotenv = dotenv() - private val hikariConfig = HikariConfig().apply { jdbcUrl = dotenv["DB_URL"] driverClassName = "org.mariadb.jdbc.Driver" diff --git a/src/main/kotlin/space/mori/chzzk_bot/Main.kt b/src/main/kotlin/space/mori/chzzk_bot/Main.kt index 9ac533a..4ad7eb8 100644 --- a/src/main/kotlin/space/mori/chzzk_bot/Main.kt +++ b/src/main/kotlin/space/mori/chzzk_bot/Main.kt @@ -11,7 +11,9 @@ import space.mori.chzzk_bot.chzzk.Connector as ChzzkConnector import java.util.concurrent.TimeUnit import kotlin.system.exitProcess -val dotenv = dotenv() +val dotenv = dotenv { + ignoreIfMissing = true +} val logger: Logger = LoggerFactory.getLogger("main") fun main(args: Array) { diff --git a/src/main/kotlin/space/mori/chzzk_bot/chzzk/Connector.kt b/src/main/kotlin/space/mori/chzzk_bot/chzzk/Connector.kt index d7a8633..9004558 100644 --- a/src/main/kotlin/space/mori/chzzk_bot/chzzk/Connector.kt +++ b/src/main/kotlin/space/mori/chzzk_bot/chzzk/Connector.kt @@ -1,13 +1,12 @@ package space.mori.chzzk_bot.chzzk -import io.github.cdimascio.dotenv.dotenv import org.slf4j.LoggerFactory import xyz.r2turntrue.chzzk4j.Chzzk import xyz.r2turntrue.chzzk4j.ChzzkBuilder import xyz.r2turntrue.chzzk4j.types.channel.ChzzkChannel +import space.mori.chzzk_bot.dotenv object Connector { - private val dotenv = dotenv() val chzzk: Chzzk = ChzzkBuilder() .withAuthorization(dotenv["NID_AUT"], dotenv["NID_SES"]) .build() diff --git a/src/main/kotlin/space/mori/chzzk_bot/discord/Discord.kt b/src/main/kotlin/space/mori/chzzk_bot/discord/Discord.kt index 4964876..765d3bd 100644 --- a/src/main/kotlin/space/mori/chzzk_bot/discord/Discord.kt +++ b/src/main/kotlin/space/mori/chzzk_bot/discord/Discord.kt @@ -6,8 +6,8 @@ import net.dv8tion.jda.api.entities.Activity import net.dv8tion.jda.api.entities.Guild import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent import net.dv8tion.jda.api.hooks.ListenerAdapter -import org.slf4j.LoggerFactory import space.mori.chzzk_bot.dotenv +import org.slf4j.LoggerFactory class Discord: ListenerAdapter() { private lateinit var bot: JDA