From: Christoph Heiss <c.heiss@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v2 proxmox-backup] api2/node/services: Handle optional services and expose unit-state
Date: Thu, 22 Dec 2022 13:05:49 +0100 [thread overview]
Message-ID: <20221222120549.3958127-2-c.heiss@proxmox.com> (raw)
In-Reply-To: <20221222120549.3958127-1-c.heiss@proxmox.com>
.. in the same way the PVE api does, esp. regarding the logic to handle
oneshot and missing services.
This then allows re-using the GUI parts from there as well, so that the
services page in PVE and PBS looks the same.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
src/api2/node/services.rs | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs
index 0cc1857e..3d3b8501 100644
--- a/src/api2/node/services.rs
+++ b/src/api2/node/services.rs
@@ -76,12 +76,26 @@ fn get_full_service_state(service: &str) -> Result<Value, Error> {
fn json_service_state(service: &str, status: Value) -> Value {
if let Some(desc) = status["Description"].as_str() {
let name = status["Name"].as_str().unwrap_or(service);
- let state = status["SubState"].as_str().unwrap_or("unknown");
+
+ let state = if status["Type"] == "oneshot" && status["SubState"] == "dead" {
+ status["Result"].as_str().or(status["SubState"].as_str())
+ } else {
+ status["SubState"].as_str()
+ }
+ .unwrap_or("unknown");
+
+ let unit_state = if status["LoadState"] == "not-found" {
+ "not-found"
+ } else {
+ status["UnitFileState"].as_str().unwrap_or("unknown")
+ };
+
return json!({
"service": service,
"name": name,
"desc": desc,
"state": state,
+ "unit-state": unit_state,
});
}
@@ -117,6 +131,10 @@ fn json_service_state(service: &str, status: Value) -> Value {
type: String,
description: "systemd service 'SubState'.",
},
+ "unit-state": {
+ type: String,
+ description: "systemd service unit state.",
+ },
},
},
},
--
2.30.2
next prev parent reply other threads:[~2022-12-22 12:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 12:05 [pbs-devel] [PATCH v2 proxmox-backup/widget-toolkit] Handle optional services and expose more details Christoph Heiss
2022-12-22 12:05 ` Christoph Heiss [this message]
2023-01-05 9:38 ` [pbs-devel] [PATCH v2 proxmox-backup] api2/node/services: Handle optional services and expose unit-state Thomas Lamprecht
2022-12-22 12:05 ` [pbs-devel] [PATCH v2 widget-toolkit] node/ServiceView: Show unit-state column in PBS too Christoph Heiss
2023-01-05 9:25 ` [pbs-devel] applied: [PATCH v2 proxmox-backup/widget-toolkit] Handle optional services and expose more details Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221222120549.3958127-2-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox