server: remove config args, store config path in supervisor

src/server/config.rs

@@ -1,12 +1,12 @@
-use std::{fs, path::PathBuf};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
 use anyhow::Context;
-use clap::Parser;
 use serde::{Deserialize, Serialize};
 use sqlx::{ConnectOptions, mysql::MySqlConnectOptions};
 
-use crate::core::common::DEFAULT_CONFIG_PATH;
-
 pub const DEFAULT_PORT: u16 = 3306;
 fn default_mysql_port() -> u16 {
     DEFAULT_PORT
@@ -17,12 +17,6 @@ fn default_mysql_timeout() -> u64 {
     DEFAULT_TIMEOUT
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct ServerConfig {
-    pub socket_path: Option<PathBuf>,
-    pub mysql: MysqlConfig,
-}
-
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(rename = "mysql")]
 pub struct MysqlConfig {
@@ -76,94 +70,20 @@ impl MysqlConfig {
     }
 }
 
-#[derive(Parser, Debug, Clone)]
-pub struct ServerConfigArgs {
-    /// Path where the server socket should be created.
-    #[arg(long, value_name = "PATH", global = true)]
-    socket_path: Option<PathBuf>,
-
-    /// Path to the socket of the MySQL server.
-    #[arg(long, value_name = "PATH", global = true)]
-    mysql_socket_path: Option<PathBuf>,
-
-    /// Hostname of the MySQL server.
-    #[arg(
-        long,
-        value_name = "HOST",
-        global = true,
-        conflicts_with = "socket_path"
-    )]
-    mysql_host: Option<String>,
-
-    /// Port of the MySQL server.
-    #[arg(
-        long,
-        value_name = "PORT",
-        global = true,
-        conflicts_with = "socket_path"
-    )]
-    mysql_port: Option<u16>,
-
-    /// Username to use for the MySQL connection.
-    #[arg(long, value_name = "USER", global = true)]
-    mysql_user: Option<String>,
-
-    /// Path to a file containing the MySQL password.
-    #[arg(long, value_name = "PATH", global = true)]
-    mysql_password_file: Option<PathBuf>,
-
-    /// Seconds to wait for the MySQL connection to be established.
-    #[arg(long, value_name = "SECONDS", global = true)]
-    mysql_connect_timeout: Option<u64>,
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct ServerConfig {
+    pub socket_path: Option<PathBuf>,
+    pub mysql: MysqlConfig,
 }
 
-/// Use the arguments and whichever configuration file which might or might not
-/// be found and default values to determine the configuration for the program.
-pub fn read_config_from_path_with_arg_overrides(
-    config_path: Option<PathBuf>,
-    args: ServerConfigArgs,
-) -> anyhow::Result<ServerConfig> {
-    let config = read_config_from_path(config_path)?;
+impl ServerConfig {
+    /// Reads the server configuration from the specified path, or the default path if none is provided.
+    pub fn read_config_from_path(config_path: &Path) -> anyhow::Result<Self> {
+        log::debug!("Reading config file at {:?}", config_path);
 
-    let mysql = config.mysql;
-
-    let password = if let Some(path) = &args.mysql_password_file {
-        Some(
-            fs::read_to_string(path)
-                .context("Failed to read MySQL password file")
-                .map(|s| s.trim().to_owned())?,
-        )
-    } else if let Some(path) = &mysql.password_file {
-        Some(
-            fs::read_to_string(path)
-                .context("Failed to read MySQL password file")
-                .map(|s| s.trim().to_owned())?,
-        )
-    } else {
-        mysql.password.to_owned()
-    };
-
-    Ok(ServerConfig {
-        socket_path: args.socket_path.or(config.socket_path),
-        mysql: MysqlConfig {
-            socket_path: args.mysql_socket_path.or(mysql.socket_path),
-            host: args.mysql_host.or(mysql.host),
-            port: args.mysql_port.unwrap_or(mysql.port),
-            username: args.mysql_user.or(mysql.username.to_owned()),
-            password,
-            password_file: args.mysql_password_file.or(mysql.password_file),
-            timeout: args.mysql_connect_timeout.unwrap_or(mysql.timeout),
-        },
-    })
-}
-
-pub fn read_config_from_path(config_path: Option<PathBuf>) -> anyhow::Result<ServerConfig> {
-    let config_path = config_path.unwrap_or_else(|| PathBuf::from(DEFAULT_CONFIG_PATH));
-
-    log::debug!("Reading config file at {:?}", &config_path);
-
-    fs::read_to_string(&config_path)
-        .context(format!("Failed to read config file at {:?}", &config_path))
-        .and_then(|c| toml::from_str(&c).context("Failed to parse config file"))
-        .context(format!("Failed to parse config file at {:?}", &config_path))
+        fs::read_to_string(config_path)
+            .context(format!("Failed to read config file at {:?}", config_path))
+            .and_then(|c| toml::from_str(&c).context("Failed to parse config file"))
+            .context(format!("Failed to parse config file at {:?}", config_path))
+    }
 }