projects
/
minecraft_web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display the minecraft server version
[minecraft_web.git]
/
backend
/
src
/
main.rs
diff --git
a/backend/src/main.rs
b/backend/src/main.rs
index
c4d7d50
..
4ce1508
100644
(file)
--- a/
backend/src/main.rs
+++ b/
backend/src/main.rs
@@
-15,6
+15,7
@@
mod minecraft_controller;
#[template(path = "main.html")]
struct MainTemplate {
text_status: String,
#[template(path = "main.html")]
struct MainTemplate {
text_status: String,
+ version: String,
memory: String,
load_average: String,
uptime: String,
memory: String,
load_average: String,
uptime: String,
@@
-38,6
+39,7
@@
async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
Some(info) =>
MainTemplate {
text_status: String::from("Minecraft server is up and running :)"),
Some(info) =>
MainTemplate {
text_status: String::from("Minecraft server is up and running :)"),
+ version: info.format_version(),
memory: info.format_memory(),
load_average: info.format_load_average(),
uptime: info.format_uptime(),
memory: info.format_memory(),
load_average: info.format_load_average(),
uptime: info.format_uptime(),
@@
-49,6
+51,7
@@
async fn main_page(config_shared: web::Data<Mutex<Config>>) -> impl Responder {
let value_unknown = String::from(VALUE_UNKNOWN);
MainTemplate {
text_status: String::from("Minecraft server is down :("),
let value_unknown = String::from(VALUE_UNKNOWN);
MainTemplate {
text_status: String::from("Minecraft server is down :("),
+ version: value_unknown.clone(),
memory: value_unknown.clone(),
load_average: value_unknown.clone(),
uptime: value_unknown.clone(),
memory: value_unknown.clone(),
load_average: value_unknown.clone(),
uptime: value_unknown.clone(),