mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-12 16:16:55 +00:00
Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/logger
# Conflicts: # Cargo.lock # Cargo.toml # rustfs/src/main.rs
This commit is contained in:
+23
-22
@@ -1,19 +1,19 @@
|
||||
[workspace]
|
||||
members = [
|
||||
"madmin",
|
||||
"rustfs",
|
||||
"ecstore",
|
||||
"e2e_test",
|
||||
"common/common",
|
||||
"common/lock",
|
||||
"common/protos",
|
||||
"api/admin",
|
||||
"reader",
|
||||
"common/workers",
|
||||
"iam",
|
||||
"crypto",
|
||||
"cli/rustfs-gui",
|
||||
"packages/logging",
|
||||
"madmin", # Management dashboard and admin API interface
|
||||
"rustfs", # Core file system implementation
|
||||
"ecstore", # Erasure coding storage implementation
|
||||
"e2e_test", # End-to-end test suite
|
||||
"common/common", # Shared utilities and data structures
|
||||
"common/lock", # Distributed locking implementation
|
||||
"common/protos", # Protocol buffer definitions
|
||||
"api/admin", # Admin HTTP API endpoints
|
||||
"reader", # Object reading service
|
||||
"common/workers", # Worker thread pools and task scheduling
|
||||
"iam", # Identity and Access Management
|
||||
"crypto", # Cryptography and security features
|
||||
"cli/rustfs-gui", # Graphical user interface client
|
||||
"packages/logging", # Logging utilities
|
||||
]
|
||||
resolver = "2"
|
||||
|
||||
@@ -36,8 +36,8 @@ async-trait = "0.1.86"
|
||||
backon = "1.3.0"
|
||||
bytes = "1.9.0"
|
||||
bytesize = "1.3.0"
|
||||
chrono = { version = "0.4.39", features = ["serde"] }
|
||||
clap = { version = "4.5.27", features = ["derive", "env"] }
|
||||
chrono = { version = "0.4.40", features = ["serde"] }
|
||||
clap = { version = "4.5.31", features = ["derive", "env"] }
|
||||
dioxus = { version = "0.6.3", features = ["router"] }
|
||||
dirs = "6.0.0"
|
||||
ecstore = { path = "./ecstore" }
|
||||
@@ -46,6 +46,7 @@ futures = "0.3.31"
|
||||
futures-util = "0.3.31"
|
||||
common = { path = "./common/common" }
|
||||
reader = { path = "./reader" }
|
||||
hex = "0.4.3"
|
||||
hyper = "1.6.0"
|
||||
hyper-util = { version = "0.1.10", features = [
|
||||
"tokio",
|
||||
@@ -58,6 +59,7 @@ humantime = "2.1.0"
|
||||
keyring = { version = "3.6.1", features = ["apple-native", "windows-native", "sync-secret-service"] }
|
||||
lock = { path = "./common/lock" }
|
||||
lazy_static = "1.5.0"
|
||||
local-ip-address = "0.6.3"
|
||||
mime = "0.3.17"
|
||||
netif = "0.1.6"
|
||||
opentelemetry = { version = "0.28" }
|
||||
@@ -80,6 +82,7 @@ rfd = { version = "0.15.2", default-features = false, features = ["xdg-portal",
|
||||
rmp = "0.8.14"
|
||||
rmp-serde = "1.3.0"
|
||||
rustfs-logging = { path = "packages/logging", version = "0.0.1" }
|
||||
rust-embed = "8.6.0"
|
||||
s3s = { git = "https://github.com/Nugine/s3s.git", rev = "ab139f72fe768fb9d8cecfe36269451da1ca9779", default-features = true, features = [
|
||||
"tower",
|
||||
] }
|
||||
@@ -87,6 +90,7 @@ s3s-policy = { git = "https://github.com/Nugine/s3s.git", rev = "ab139f72fe768fb
|
||||
shadow-rs = { version = "0.38.0", default-features = false }
|
||||
serde = { version = "1.0.217", features = ["derive"] }
|
||||
serde_json = "1.0.138"
|
||||
sha2 = "0.10.8"
|
||||
tempfile = "3.16.0"
|
||||
thiserror = "2.0.11"
|
||||
time = { version = "0.3.37", features = [
|
||||
@@ -109,7 +113,7 @@ tracing-appender = "0.2.3"
|
||||
tracing-opentelemetry = "0.29"
|
||||
transform-stream = "0.3.1"
|
||||
url = "2.5.4"
|
||||
uuid = { version = "1.12.1", features = [
|
||||
uuid = { version = "1.15.1", features = [
|
||||
"v4",
|
||||
"fast-rng",
|
||||
"macro-diagnostics",
|
||||
@@ -119,10 +123,7 @@ axum = "0.7.9"
|
||||
md-5 = "0.10.6"
|
||||
workers = { path = "./common/workers" }
|
||||
test-case = "3.3.1"
|
||||
zip = "2.2.2"
|
||||
|
||||
|
||||
[profile]
|
||||
zip = "2.2.3"
|
||||
|
||||
[profile.wasm-dev]
|
||||
inherits = "dev"
|
||||
@@ -137,4 +138,4 @@ inherits = "dev"
|
||||
[profile.release]
|
||||
opt-level = 3 # Optimization Level (0-3)
|
||||
lto = true # Optimize when linking
|
||||
codegen-units = 1 # Reduce code generation units to improve optimization
|
||||
codegen-units = 1 # Reduce code generation units to improve optimization
|
||||
|
||||
Reference in New Issue
Block a user