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

Fixing URL output format in IPv6 environments #1343 and Incorrect time in UI #1350 (#1363)

Browse Source
This commit is contained in:
houseme
2026-01-04 14:56:54 +08:00
committed by GitHub
parent d06397cf4a
commit 75b144b7d4
5 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/main.rs
+3
View File
@@ -369,6 +369,9 @@ async fn run(opt: config::Opt) -> Result<()> {
// 4. Mark as Full Ready now that critical components are warm
readiness.mark_stage(SystemStage::FullReady);
// Set the global RustFS initialization time to now
rustfs_common::set_global_init_time_now().await;
// Perform hibernation for 1 second
tokio::time::sleep(SHUTDOWN_TIMEOUT).await;
// listen to the shutdown signal
rustfs/src/server/http.rs
+13 -6
View File
@@ -177,6 +177,9 @@ pub async fn start_http_server(
TcpListener::from_std(socket.into())?
};
let tls_acceptor = setup_tls_acceptor(opt.tls_path.as_deref().unwrap_or_default()).await?;
let tls_enabled = tls_acceptor.is_some();
let protocol = if tls_enabled { "https" } else { "http" };
// Obtain the listener address
let local_addr: SocketAddr = listener.local_addr()?;
let local_ip = match rustfs_utils::get_local_ip() {
@@ -186,11 +189,15 @@ pub async fn start_http_server(
local_addr.ip()
}
};
let tls_acceptor = setup_tls_acceptor(opt.tls_path.as_deref().unwrap_or_default()).await?;
let tls_enabled = tls_acceptor.is_some();
let protocol = if tls_enabled { "https" } else { "http" };
let local_ip_str = if local_ip.is_ipv6() {
format!("[{local_ip}]")
} else {
local_ip.to_string()
};
// Detailed endpoint information (showing all API endpoints)
let api_endpoints = format!("{protocol}://{local_ip}:{server_port}");
let api_endpoints = format!("{protocol}://{local_ip_str}:{server_port}");
let localhost_endpoint = format!("{protocol}://127.0.0.1:{server_port}");
let now_time = chrono::Local::now().format("%Y-%m-%d %H:%M:%S").to_string();
if opt.console_enable {
@@ -198,7 +205,7 @@ pub async fn start_http_server(
info!(
target: "rustfs::console::startup",
"Console WebUI available at: {protocol}://{local_ip}:{server_port}/rustfs/console/index.html"
"Console WebUI available at: {protocol}://{local_ip_str}:{server_port}/rustfs/console/index.html"
);
info!(
target: "rustfs::console::startup",
@@ -207,7 +214,7 @@ pub async fn start_http_server(
);
println!("Console WebUI Start Time: {now_time}");
println!("Console WebUI available at: {protocol}://{local_ip}:{server_port}/rustfs/console/index.html");
println!("Console WebUI available at: {protocol}://{local_ip_str}:{server_port}/rustfs/console/index.html");
println!("Console WebUI (localhost): {protocol}://127.0.0.1:{server_port}/rustfs/console/index.html",);
} else {
info!(target: "rustfs::main::startup","RustFS API: {api_endpoints} {localhost_endpoint}");