gsadmin/Portabase.Agent
1
0
Fork 0
mirror of https://github.com/Portabase/agent.git synced 2026-09-11 02:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: config.rs

Browse Source
This commit is contained in:
charles-gauthereau
2026-08-18 13:07:22 +02:00
parent 2464f6dfb0
commit cf9a59a138
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/config.rs
+33 -13
View File
@@ -118,34 +118,54 @@ pub fn build_config(db: InputDatabaseConfig) -> Result<DatabaseConfig, String> {
}
let username = match db.db_type {
DbType::Postgresql | DbType::PostgresqlCluster | DbType::Mysql | DbType::Mariadb
DbType::Postgresql
| DbType::PostgresqlCluster
| DbType::Mysql
| DbType::Mariadb
| DbType::Mssql => required(&db.username, &db.name, "username")?,
_ => optional(&db.username),
};
let password = match db.db_type {
DbType::Postgresql | DbType::PostgresqlCluster | DbType::Mysql | DbType::Mariadb
DbType::Postgresql
| DbType::PostgresqlCluster
| DbType::Mysql
| DbType::Mariadb
| DbType::Mssql => required(&db.password, &db.name, "password")?,
_ => optional(&db.password),
};
let host = match db.db_type {
DbType::Postgresql | DbType::PostgresqlCluster | DbType::Mysql | DbType::Mariadb
| DbType::MongoDB | DbType::Redis | DbType::Firebird | DbType::Valkey | DbType::Mssql => {
required(&db.host, &db.name, "host")?
}
DbType::Postgresql
| DbType::PostgresqlCluster
| DbType::Mysql
| DbType::Mariadb
| DbType::MongoDB
| DbType::Redis
| DbType::Firebird
| DbType::Valkey
| DbType::Mssql => required(&db.host, &db.name, "host")?,
DbType::Sqlite | DbType::DockerVolume => optional(&db.host),
};
let port = match db.db_type {
DbType::Postgresql | DbType::PostgresqlCluster | DbType::Mysql | DbType::Mariadb
| DbType::MongoDB | DbType::Redis | DbType::Firebird | DbType::Valkey | DbType::Mssql => {
required(&db.port, &db.name, "port")?
}
DbType::Sqlite | DbType::DockerVolume => db.port.unwrap_or(0),
DbType::Postgresql
| DbType::PostgresqlCluster
| DbType::Mysql
| DbType::Mariadb
| DbType::Redis
| DbType::Firebird
| DbType::Valkey
| DbType::Mssql => required(&db.port, &db.name, "port")?,
DbType::MongoDB | DbType::Sqlite | DbType::DockerVolume => db.port.unwrap_or(0),
};
let database_name = match db.db_type {
DbType::Sqlite | DbType::Redis | DbType::Valkey | DbType::DockerVolume => {
optional(&db.database)
}
DbType::PostgresqlCluster => db.database.clone().unwrap_or_else(|| "postgres".to_string()),
DbType::PostgresqlCluster => db
.database
.clone()
.unwrap_or_else(|| "postgres".to_string()),
_ => required(&db.database, &db.name, "database")?,
};
let path_val = match db.db_type {
@@ -238,7 +258,7 @@ impl ConfigService {
info!("Databases: {} instances loaded", databases.len());
Ok(DatabasesConfig { databases })
}
pub fn load_optional(&self, file_path: Option<&str>) -> DatabasesConfig {
self.load(file_path).unwrap_or_else(|e| {
tracing::warn!(