api2/node/syslog: use 'real_service_name' here also
for now this only does the 'postfix' -> 'postfix@-' conversion, fixes the issue that we only showed the 'postfix' service syslog (which is rather empty in a default setup) instead of the instance one Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
parent
beb07279b6
commit
1d8f849457
|
@ -34,7 +34,7 @@ pub mod subscription;
|
||||||
pub(crate) mod rrd;
|
pub(crate) mod rrd;
|
||||||
|
|
||||||
mod journal;
|
mod journal;
|
||||||
mod services;
|
pub(crate) mod services;
|
||||||
mod status;
|
mod status;
|
||||||
mod syslog;
|
mod syslog;
|
||||||
mod time;
|
mod time;
|
||||||
|
|
|
@ -22,7 +22,7 @@ static SERVICE_NAME_LIST: [&str; 7] = [
|
||||||
"systemd-timesyncd",
|
"systemd-timesyncd",
|
||||||
];
|
];
|
||||||
|
|
||||||
fn real_service_name(service: &str) -> &str {
|
pub fn real_service_name(service: &str) -> &str {
|
||||||
|
|
||||||
// since postfix package 3.1.0-3.1 the postfix unit is only here
|
// since postfix package 3.1.0-3.1 the postfix unit is only here
|
||||||
// to manage subinstances, of which the default is called "-".
|
// to manage subinstances, of which the default is called "-".
|
||||||
|
|
|
@ -134,12 +134,18 @@ fn get_syslog(
|
||||||
mut rpcenv: &mut dyn RpcEnvironment,
|
mut rpcenv: &mut dyn RpcEnvironment,
|
||||||
) -> Result<Value, Error> {
|
) -> Result<Value, Error> {
|
||||||
|
|
||||||
|
let service = if let Some(service) = param["service"].as_str() {
|
||||||
|
Some(crate::api2::node::services::real_service_name(service))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let (count, lines) = dump_journal(
|
let (count, lines) = dump_journal(
|
||||||
param["start"].as_u64(),
|
param["start"].as_u64(),
|
||||||
param["limit"].as_u64(),
|
param["limit"].as_u64(),
|
||||||
param["since"].as_str(),
|
param["since"].as_str(),
|
||||||
param["until"].as_str(),
|
param["until"].as_str(),
|
||||||
param["service"].as_str())?;
|
service)?;
|
||||||
|
|
||||||
rpcenv["total"] = Value::from(count);
|
rpcenv["total"] = Value::from(count);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue