gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-20 11:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor main.rs for clarity and modularity in rustfs-gui (#225)

Browse Source 
* Improve init_logger function and format code with cargo fmt

- Enhance `init_logger` function for better logging configuration.
- Apply `cargo fmt` to format the codebase.

* Refactor main.rs for clarity and modularity in rustfs-gui

- Move `init_logger` function to `utils/logger.rs` for better separation of concerns.
- Create a dedicated `router` module in `router/router.rs`.
- Update `main.rs` to use the new `logger` and `router` modules.
- Apply `cargo fmt` to format the codebase.
This commit is contained in:
houseme
2025-02-18 18:37:17 +08:00
committed by GitHub
parent 279f8397f7
commit 391eb5b6f9
14 changed files with 141 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/rustfs-gui/src/utils/config.rs
+6 -18
View File
@@ -122,36 +122,24 @@ impl RustFSConfig {
if let Ok(stored_json) = entry.get_password() {
if let Ok(stored_config) = serde_json::from_str::<RustFSConfig>(&stored_json) {
// update fields that are not empty and non default
if !stored_config.address.is_empty()
&& stored_config.address != Self::DEFAULT_ADDRESS_VALUE
{
if !stored_config.address.is_empty() && stored_config.address != Self::DEFAULT_ADDRESS_VALUE {
config.address = stored_config.address;
let (host, port) = Self::extract_host_port(config.address.as_str())
.ok_or_else(|| {
format!("无法从地址 '{}' 中提取主机和端口", config.address)
})?;
.ok_or_else(|| format!("无法从地址 '{}' 中提取主机和端口", config.address))?;
config.host = host.to_string();
config.port = port.to_string();
}
if !stored_config.access_key.is_empty()
&& stored_config.access_key != Self::DEFAULT_ACCESS_KEY_VALUE
{
if !stored_config.access_key.is_empty() && stored_config.access_key != Self::DEFAULT_ACCESS_KEY_VALUE {
config.access_key = stored_config.access_key;
}
if !stored_config.secret_key.is_empty()
&& stored_config.secret_key != Self::DEFAULT_SECRET_KEY_VALUE
{
if !stored_config.secret_key.is_empty() && stored_config.secret_key != Self::DEFAULT_SECRET_KEY_VALUE {
config.secret_key = stored_config.secret_key;
}
if !stored_config.domain_name.is_empty()
&& stored_config.domain_name != Self::DEFAULT_DOMAIN_NAME_VALUE
{
if !stored_config.domain_name.is_empty() && stored_config.domain_name != Self::DEFAULT_DOMAIN_NAME_VALUE {
config.domain_name = stored_config.domain_name;
}
// The stored volume_name is updated only if it is not empty and different from the default
if !stored_config.volume_name.is_empty()
&& stored_config.volume_name != Self::default_volume_name()
{
if !stored_config.volume_name.is_empty() && stored_config.volume_name != Self::default_volume_name() {
config.volume_name = stored_config.volume_name;
}
if !stored_config.console_address.is_empty()