aboutsummaryrefslogtreecommitdiff
path: root/src/garage/admin.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-09-08 15:49:17 +0200
committerAlex Auvolat <alex@adnab.me>2022-09-08 15:49:17 +0200
commitd9d199a6c9c0ae2a6ee2b04103c78ef1eb311956 (patch)
tree53429d4faa2e696dd798515e2db493bc78ba5e48 /src/garage/admin.rs
parentd23b3a14fc28de164080e762f0e97e6cbc868940 (diff)
parent03c40a0b24dd5bd2a51d3cd3df0ca1a42fb2d328 (diff)
downloadgarage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.tar.gz
garage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.zip
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/garage/admin.rs')
-rw-r--r--src/garage/admin.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index 76261050..b4d2d1a1 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -741,8 +741,11 @@ impl AdminRpcHandler {
let mut ret = String::new();
writeln!(
&mut ret,
- "\nGarage version: {}",
- self.garage.system.garage_version(),
+ "\nGarage version: {} [features: {}]",
+ garage_util::version::garage_version(),
+ garage_util::version::garage_features()
+ .map(|list| list.join(", "))
+ .unwrap_or_else(|| "(unknown)".into()),
)
.unwrap();
writeln!(&mut ret, "\nDatabase engine: {}", self.garage.db.engine()).unwrap();