From 2099c1753a28d1fa946b394f04c336841e36acbb Mon Sep 17 00:00:00 2001 From: anthorob Date: Sat, 13 Jul 2024 23:55:21 -0400 Subject: [PATCH] fix: fix wrongly named environment variables --- .env.example | 10 +++++----- bot.properties.example | 10 +++++----- docker-compose.yml | 1 + .../me/bobert/netneutrality/core/SessionManager.java | 8 ++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index ffdbd3b..81b3a9a 100644 --- a/.env.example +++ b/.env.example @@ -4,10 +4,10 @@ NETNEUTRALITY_BOT_PREFIX=$ NETNEUTRALITY_BOT_OWNER= NETNEUTRALITY_API_PORT=9000 -NETNEUTRALITY_MYSQL_HOST=127.0.0.1 -NETNEUTRALITY_MYSQL_USER=root -NETNEUTRALITY_MYSQL_PASSWORD= -NETNEUTRALITY_MYSQL_DATABASE= -NETNEUTRALITY_MYSQL_PORT=3306 +MYSQL_HOST=127.0.0.1 +MYSQL_USER=root +MYSQL_PASSWORD= +MYSQL_DATABASE= +MYSQL_PORT=3306 NETNEUTRALITY_SENTRY_DSN= \ No newline at end of file diff --git a/bot.properties.example b/bot.properties.example index 62682ba..fe1be76 100644 --- a/bot.properties.example +++ b/bot.properties.example @@ -4,10 +4,10 @@ NETNEUTRALITY_BOT_PREFIX= NETNEUTRALITY_BOT_OWNER= NETNEUTRALITY_API_PORT=9000 -NETNEUTRALITY_MYSQL_HOST=127.0.0.1 -NETNEUTRALITY_MYSQL_USER=root -NETNEUTRALITY_MYSQL_PASSWORD= -NETNEUTRALITY_MYSQL_DATABASE= -NETNEUTRALITY_MYSQL_PORT=3306 +MYSQL_HOST=127.0.0.1 +MYSQL_USER=root +MYSQL_PASSWORD= +MYSQL_DATABASE= +MYSQL_PORT=3306 NETNEUTRALITY_SENTRY_DSN= \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7aa7b13..19e1c1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,7 @@ services: MYSQL_USER: 'java' MYSQL_PASSWORD: 'password' MYSQL_DATABASE: 'netneutrality' + env_file: ".env" ports: - "9000:9000" networks: diff --git a/src/main/java/me/bobert/netneutrality/core/SessionManager.java b/src/main/java/me/bobert/netneutrality/core/SessionManager.java index e79cf8e..fab89e5 100644 --- a/src/main/java/me/bobert/netneutrality/core/SessionManager.java +++ b/src/main/java/me/bobert/netneutrality/core/SessionManager.java @@ -29,10 +29,10 @@ public class SessionManager { try { StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder().configure(); Map settings = new HashMap<>(); - String dbName = Settings.getInstance().get("NETNEUTRALITY_MYSQL_DATABASE", "netneutrality"); - String dbUser = Settings.getInstance().get("NETNEUTRALITY_MYSQL_USER", "root"); - String dbPass = Settings.getInstance().get("NETNEUTRALITY_MYSQL_PASSWORD", ""); - String dbHost = Settings.getInstance().get("NETNEUTRALITY_MYSQL_HOST", "localhost"); + String dbName = Settings.getInstance().get("MYSQL_DATABASE", "netneutrality"); + String dbUser = Settings.getInstance().get("MYSQL_USER", "root"); + String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", ""); + String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost"); logger.info(String.format("Connecting to database '%s' at %s:3306 with user '%s'", dbName, dbHost, dbUser)); settings.put(Environment.URL, String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName));