fix: hook postgres host config up

sotterbeck · Aug 12, 2024 · bafc93b · bafc93b
1 parent c606c8a
commit bafc93b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/...nts/papermc/src/main/java/de/sotterbeck/iumetro/entrypoint/papermc/PersistenceModule.java b/...nts/papermc/src/main/java/de/sotterbeck/iumetro/entrypoint/papermc/PersistenceModule.java
@@ -16,10 +16,12 @@ class PersistenceModule extends AbstractModule {
     @Provides
     @Singleton
     static DataSource provideDataSource(FileConfiguration config) {
-        return new HikariDataSourceProvider.Builder(
-                config.getString("postgres.database"),
-                config.getString("postgres.username"),
-                config.getString("postgres.password"))
+        String database = config.getString("postgres.database");
+        String username = config.getString("postgres.username");
+        String password = config.getString("postgres.password");
+        return new HikariDataSourceProvider.Builder(database, username, password)
+                .host(config.getString("postgres.host"))
+                .port(config.getInt("postgres.port"))
                 .schema(config.getString("postgres.schema"))
                 .build()
                 .get();

diff --git a/...c/main/java/de/sotterbeck/iumetro/entrypoint/papermc/common/HikariDataSourceProvider.java b/...c/main/java/de/sotterbeck/iumetro/entrypoint/papermc/common/HikariDataSourceProvider.java
@@ -14,11 +14,15 @@ public class HikariDataSourceProvider implements Supplier<DataSource> {
     private final String password;
     private final String dataSourceClassName;
     private final String schema;
+    private final String host;
+    private final int port;
 
     private HikariDataSourceProvider(Builder builder) {
         databaseName = builder.databaseName;
         user = builder.user;
         password = builder.password;
+        host = builder.host;
+        port = builder.port;
         dataSourceClassName = builder.dataSourceClassName;
         schema = builder.schema;
     }
@@ -35,6 +39,8 @@ private Properties getDatabaseProperties() {
         properties.setProperty("dataSource.user", user);
         properties.setProperty("dataSource.password", password);
         properties.setProperty("dataSource.databaseName", databaseName);
+        properties.setProperty("dataSource.serverName", host);
+        properties.setProperty("dataSource.portNumber", String.valueOf(port));
         properties.setProperty("dataSource.currentSchema", schema);
         return properties;
     }
@@ -44,6 +50,8 @@ public static class Builder {
         private final String databaseName;
         private final String user;
         private final String password;
+        private String host = "localhost";
+        private int port = 5432;
         private String dataSourceClassName = "org.postgresql.ds.PGSimpleDataSource";
         private String schema;
 
@@ -63,6 +71,16 @@ public Builder schema(String schema) {
             return this;
         }
 
+        public Builder host(String host) {
+            this.host = host;
+            return this;
+        }
+
+        public Builder port(int port) {
+            this.port = port;
+            return this;
+        }
+
         public Supplier<DataSource> build() {
             return new HikariDataSourceProvider(this);
         }

diff --git a/entrypoints/papermc/src/main/resources/config.yml b/entrypoints/papermc/src/main/resources/config.yml
@@ -1,5 +1,6 @@
 postgres:
-  host: "127.0.0.1:5432"
+  host: "127.0.0.1"
+  port: 5432
   database: postgres
   username: postgres
   password: password