Rename MONGO_HOSTNAME to MONGO_CONNECTION_STRING, stop prepending "mo…

…ngodb://" to the hostname

README.md

@@ -37,7 +37,7 @@ Environment variables:
 * `BLUEDRAGON_AGONES_DISABLED` - Disables Agones integration if set to any value.
 * `BLUEDRAGON_ENV_TYPE` - Set to "DEV" to enable development mode.
 * `BLUEDRAGON_QUEUE_TYPE` - Set to "IPC" to use Puffin or "TEST" for the `TestQueue`. If not present, a default value is inferred.
-* `BLUEDRAGON_MONGO_HOSTNAME` - The hostname used to connect to MongoDB.
+* `BLUEDRAGON_MONGO_CONNECTION_STRING` - The connection string used to connect to MongoDB.
 * `BLUEDRAGON_PUFFIN_HOSTNAME` - The hostname used to connect to Puffin.
 * `BLUEDRAGON_LUCKPERMS_HOSTNAME` - The hostname used to connect to LuckPerms.
 * `HOSTNAME` - Used to determine the server name. Provided by default in Docker or Kubernetes environments.

common/src/main/kotlin/com/bluedragonmc/server/api/Environment.kt

@@ -9,7 +9,7 @@ abstract class Environment {
         lateinit var current: Environment
 
         val queue get() = current.queue
-        val mongoHostname get() = current.mongoHostname
+        val mongoConnectionString get() = current.mongoConnectionString
         val dbName get() = current.dbName
         val puffinHostname get() = current.puffinHostname
         val defaultGameName get() = current.defaultGameName
@@ -26,7 +26,7 @@ abstract class Environment {
     }
 
     abstract val queue: Queue
-    abstract val mongoHostname: String
+    abstract val mongoConnectionString: String
     abstract val puffinHostname: String
     abstract val luckPermsHostname: String
     abstract val gameClasses: Collection<String>

src/main/kotlin/com/bluedragonmc/server/bootstrap/IntegrationsInit.kt

@@ -30,7 +30,7 @@ object IntegrationsInit : Bootstrap() {
             }
         }
 
-        Database.initialize(DatabaseConnectionImpl("mongodb://${Environment.mongoHostname}"))
+        Database.initialize(DatabaseConnectionImpl(Environment.mongoConnectionString))
         Permissions.initialize(PermissionManagerImpl())
 
         if (Environment.current.isDev) {
@@ -48,7 +48,7 @@ object IntegrationsInit : Bootstrap() {
                 Database.connection.logEvent(
                     EventLog("game_server_started", Severity.DEBUG)
                         .withProperty("is_dev", Environment.isDev.toString())
-                        .withProperty("mongo_hostname", Environment.mongoHostname)
+                        .withProperty("mongo_hostname", Environment.mongoConnectionString)
                         .withProperty("puffin_hostname", Environment.puffinHostname)
                         .withProperty("luckperms_hostname", Environment.current.luckPermsHostname)
                         .withProperty("game_classes", Environment.current.gameClasses)

src/main/kotlin/com/bluedragonmc/server/queue/environments.kt

@@ -28,7 +28,7 @@ class ConfiguredEnvironment : Environment() {
         else -> defaultQueue()
     }
 
-    override val mongoHostname: String = System.getenv("BLUEDRAGON_MONGO_HOSTNAME") ?: defaultMongoHostname()
+    override val mongoConnectionString: String = System.getenv("BLUEDRAGON_MONGO_CONNECTION_STRING") ?: defaultMongoConnectionString()
     override val puffinHostname: String = System.getenv("BLUEDRAGON_PUFFIN_HOSTNAME") ?: defaultPuffinHostname()
     override val luckPermsHostname: String = System.getenv("BLUEDRAGON_LUCKPERMS_HOSTNAME") ?: defaultLuckPermsHostname()
 
@@ -63,10 +63,10 @@ private fun defaultQueue(): Queue {
     return if (isDev()) TestQueue() else IPCQueue
 }
 
-private fun defaultMongoHostname(): String {
+private fun defaultMongoConnectionString(): String {
     LoggerFactory.getLogger(Environment::class.java)
         .warn("No environment variable specified, using default MongoDB connection configuration.")
-    return if (isDev()) "localhost:27017" else "mongo:27017"
+    return if (isDev()) "mongodb://localhost:27017" else "mongodb://mongo:27017"
 }
 
 private fun defaultPuffinHostname(): String {