anthorob/netneutrality
1
0 Fork 0
Code Issues 1 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

fix: fix wrongly named environment variables

Browse Source
This commit is contained in:
anthorob committed 2024-07-13 23:55:21 -04:00
1 parent dc4ea8c661
commit 2099c1753a
4 files changed
+15 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.example
+5 -5
View File
@@ -4,10 +4,10 @@ NETNEUTRALITY_BOT_PREFIX=$
NETNEUTRALITY_BOT_OWNER= NETNEUTRALITY_BOT_OWNER=
NETNEUTRALITY_API_PORT=9000 NETNEUTRALITY_API_PORT=9000
NETNEUTRALITY_MYSQL_HOST=127.0.0.1 MYSQL_HOST=127.0.0.1
NETNEUTRALITY_MYSQL_USER=root MYSQL_USER=root
NETNEUTRALITY_MYSQL_PASSWORD= MYSQL_PASSWORD=
NETNEUTRALITY_MYSQL_DATABASE= MYSQL_DATABASE=
NETNEUTRALITY_MYSQL_PORT=3306 MYSQL_PORT=3306
NETNEUTRALITY_SENTRY_DSN= NETNEUTRALITY_SENTRY_DSN=
bot.properties.example
+5 -5
View File
@@ -4,10 +4,10 @@ NETNEUTRALITY_BOT_PREFIX=
NETNEUTRALITY_BOT_OWNER= NETNEUTRALITY_BOT_OWNER=
NETNEUTRALITY_API_PORT=9000 NETNEUTRALITY_API_PORT=9000
NETNEUTRALITY_MYSQL_HOST=127.0.0.1 MYSQL_HOST=127.0.0.1
NETNEUTRALITY_MYSQL_USER=root MYSQL_USER=root
NETNEUTRALITY_MYSQL_PASSWORD= MYSQL_PASSWORD=
NETNEUTRALITY_MYSQL_DATABASE= MYSQL_DATABASE=
NETNEUTRALITY_MYSQL_PORT=3306 MYSQL_PORT=3306
NETNEUTRALITY_SENTRY_DSN= NETNEUTRALITY_SENTRY_DSN=
docker-compose.yml
+1
View File
@@ -30,6 +30,7 @@ services:
MYSQL_USER: 'java' MYSQL_USER: 'java'
MYSQL_PASSWORD: 'password' MYSQL_PASSWORD: 'password'
MYSQL_DATABASE: 'netneutrality' MYSQL_DATABASE: 'netneutrality'
env_file: ".env"
ports: ports:
- "9000:9000" - "9000:9000"
networks: networks:
src/main/java/me/bobert/netneutrality/core/SessionManager.java
+4 -4
View File
@@ -29,10 +29,10 @@ public class SessionManager {
try { try {
StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder().configure(); StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder().configure();
Map<String, Object> settings = new HashMap<>(); Map<String, Object> settings = new HashMap<>();
String dbName = Settings.getInstance().get("NETNEUTRALITY_MYSQL_DATABASE", "netneutrality"); String dbName = Settings.getInstance().get("MYSQL_DATABASE", "netneutrality");
String dbUser = Settings.getInstance().get("NETNEUTRALITY_MYSQL_USER", "root"); String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
String dbPass = Settings.getInstance().get("NETNEUTRALITY_MYSQL_PASSWORD", ""); String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
String dbHost = Settings.getInstance().get("NETNEUTRALITY_MYSQL_HOST", "localhost"); 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)); 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)); settings.put(Environment.URL, String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName));