sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[chore](trx-app): drop per-binary config file support

Browse Source 
Only trx-rs.toml with [trx-server] / [trx-client] section headers is
now supported. Simplify ConfigFile trait to a single required method
section_key(); remove config_filename(), combined_key(), and
default_search_paths(). load_from_file() now errors when the expected
section is absent rather than falling back to flat parsing.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-02-28 08:45:32 +01:00
parent 1ee0389de8
commit 2f2a74b810
4 changed files with 37 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trx-server/src/config.rs
+7 -20
View File
@@ -4,11 +4,12 @@
//! Configuration file support for trx-server.
//!
//! Supports loading configuration from TOML files with the following search order:
//! Config is loaded from the `[trx-server]` section of `trx-rs.toml`.
//! Default search order:
//! 1. Path specified via `--config` CLI argument
//! 2. `./trx-rs.toml` `[trx-server]` section, or `./trx-server.toml`
//! 3. `~/.config/trx-rs/trx-rs.toml` `[trx-server]` section, or `~/.config/trx-rs/server.toml`
//! 4. `/etc/trx-rs/trx-rs.toml` `[trx-server]` section, or `/etc/trx-rs/server.toml`
//! 2. `./trx-rs.toml`
//! 3. `~/.config/trx-rs/trx-rs.toml`
//! 4. `/etc/trx-rs/trx-rs.toml`
use std::net::IpAddr;
use std::path::{Path, PathBuf};
@@ -789,22 +790,8 @@ fn validate_tokens(path: &str, tokens: &[String]) -> Result<(), String> {
}
impl ConfigFile for ServerConfig {
fn config_filename() -> &'static str {
"server.toml"
}
fn combined_key() -> Option<&'static str> {
Some("trx-server")
}
fn default_search_paths() -> Vec<PathBuf> {
let mut paths = Vec::new();
paths.push(PathBuf::from("trx-server.toml"));
if let Some(config_dir) = dirs::config_dir() {
paths.push(config_dir.join("trx-rs").join("server.toml"));
}
paths.push(PathBuf::from("/etc/trx-rs/server.toml"));
paths
fn section_key() -> &'static str {
"trx-server"
}
}