summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@ifm.com>2022-04-13 14:02:36 +0200
committerMatthias Beyer <matthias.beyer@ifm.com>2022-04-13 14:34:30 +0200
commitbde5b9f075837d4a4740775ff59c376f34f59e02 (patch)
tree94976306b8841ff4891030d51e0d87431f52bd3b
parent178c7904911605675dd43e294cf10f4c53d89e88 (diff)
plugin_sysstat: Adapt for miette as error handling crate
This patch adapts the plugin_sysstat crate for the changes from commit 9ccd86589db8f9a72c4d7f545813e8da40b4d039 ("Replace PluginError with miette::Error") which replaced anyhow with miette. Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>
-rw-r--r--Cargo.lock2
-rw-r--r--plugins/plugin_sysstat/Cargo.toml2
-rw-r--r--plugins/plugin_sysstat/src/builder.rs4
-rw-r--r--plugins/plugin_sysstat/src/main/cpu.rs2
-rw-r--r--plugins/plugin_sysstat/src/main/disk_usage.rs6
-rw-r--r--plugins/plugin_sysstat/src/main/load.rs2
-rw-r--r--plugins/plugin_sysstat/src/main/memory.rs2
-rw-r--r--plugins/plugin_sysstat/src/main/network.rs2
-rw-r--r--plugins/plugin_sysstat/src/main/process.rs2
-rw-r--r--plugins/plugin_sysstat/src/plugin.rs2
10 files changed, 13 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock
index b89258eb..c0b618eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2090,10 +2090,10 @@ dependencies = [
name = "plugin_sysstat"
version = "0.1.0"
dependencies = [
- "anyhow",
"async-trait",
"futures",
"log",
+ "miette",
"serde",
"sysinfo",
"tedge_api",
diff --git a/plugins/plugin_sysstat/Cargo.toml b/plugins/plugin_sysstat/Cargo.toml
index 47c97839..40611451 100644
--- a/plugins/plugin_sysstat/Cargo.toml
+++ b/plugins/plugin_sysstat/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-anyhow = "1"
async-trait = "0.1"
log = "0.4"
serde = { version = "1.0.136", features = ["derive"] }
+miette = "4.4"
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
tokio-util = "0.7.0"
sysinfo = "0.23"
diff --git a/plugins/plugin_sysstat/src/builder.rs b/plugins/plugin_sysstat/src/builder.rs
index c7d2684c..f2b21e2d 100644
--- a/plugins/plugin_sysstat/src/builder.rs
+++ b/plugins/plugin_sysstat/src/builder.rs
@@ -38,7 +38,7 @@ impl<PD: PluginDirectory> PluginBuilder<PD> for SysStatPluginBuilder {
.clone()
.try_into()
.map(|_: SysStatConfig| ())
- .map_err(|e| anyhow::anyhow!("Failed to parse sysinfo configuration: {:?}", e))
+ .map_err(|e| miette::miette!("Failed to parse sysinfo configuration: {:?}", e))
.map_err(PluginError::from)
}
@@ -50,7 +50,7 @@ impl<PD: PluginDirectory> PluginBuilder<PD> for SysStatPluginBuilder {
) -> Result<BuiltPlugin, PluginError> {
let config = config
.try_into::<SysStatConfig>()
- .map_err(|e| anyhow::anyhow!("Failed to parse sysinfo configuration: {:?}", e))?;
+ .map_err(|e| miette::miette!("Failed to parse sysinfo configuration: {:?}", e))?;
let build_addr_config = |adrs: &[String]| {
adrs.iter()
diff --git a/plugins/plugin_sysstat/src/main/cpu.rs b/plugins/plugin_sysstat/src/main/cpu.rs
index 213a48f8..d29856d9 100644
--- a/plugins/plugin_sysstat/src/main/cpu.rs
+++ b/plugins/plugin_sysstat/src/main/cpu.rs
@@ -160,7 +160,7 @@ pub async fn main_cpu(state: Arc<Mutex<CPUState>>) -> Result<(), PluginError> {
.await
.into_iter()
.collect::<Result<Vec<_>, _>>()
- .map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ .map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
}
diff --git a/plugins/plugin_sysstat/src/main/disk_usage.rs b/plugins/plugin_sysstat/src/main/disk_usage.rs
index 63b912b0..58fb0597 100644
--- a/plugins/plugin_sysstat/src/main/disk_usage.rs
+++ b/plugins/plugin_sysstat/src/main/disk_usage.rs
@@ -68,7 +68,7 @@ pub async fn main_disk_usage(state: Arc<Mutex<DiskUsageState>>) -> Result<(), Pl
.await
.into_iter()
.map(|res| {
- res.map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ res.map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
})
.collect::<Result<Vec<()>, PluginError>>()
@@ -90,10 +90,10 @@ fn measure_to_messages<'a>(
.name()
.to_os_string()
.into_string()
- .map_err(|_| anyhow::anyhow!("Cannot read disk name"))?;
+ .map_err(|_| miette::miette!("Cannot read disk name"))?;
let disk_fs = std::str::from_utf8(disk.file_system())
- .map_err(|_| anyhow::anyhow!("Disk Filesystem name not valid UTF-8"))?;
+ .map_err(|_| miette::miette!("Disk Filesystem name not valid UTF-8"))?;
let disk_type = match disk.type_() {
sysinfo::DiskType::HDD => "HDD",
diff --git a/plugins/plugin_sysstat/src/main/load.rs b/plugins/plugin_sysstat/src/main/load.rs
index b930b88a..677a1d15 100644
--- a/plugins/plugin_sysstat/src/main/load.rs
+++ b/plugins/plugin_sysstat/src/main/load.rs
@@ -67,7 +67,7 @@ pub async fn main_load(state: Arc<Mutex<LoadState>>) -> Result<(), PluginError>
.await
.into_iter()
.map(|res| {
- res.map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ res.map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
})
.collect::<Result<Vec<_>, PluginError>>()
diff --git a/plugins/plugin_sysstat/src/main/memory.rs b/plugins/plugin_sysstat/src/main/memory.rs
index d1a8a0ef..6b587b38 100644
--- a/plugins/plugin_sysstat/src/main/memory.rs
+++ b/plugins/plugin_sysstat/src/main/memory.rs
@@ -140,7 +140,7 @@ pub async fn main_memory(state: Arc<Mutex<MemoryState>>) -> Result<(), PluginErr
.await
.into_iter()
.map(|res| {
- res.map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ res.map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
})
.collect::<Result<Vec<()>, PluginError>>()
diff --git a/plugins/plugin_sysstat/src/main/network.rs b/plugins/plugin_sysstat/src/main/network.rs
index fea4cd0e..d154c243 100644
--- a/plugins/plugin_sysstat/src/main/network.rs
+++ b/plugins/plugin_sysstat/src/main/network.rs
@@ -90,7 +90,7 @@ pub async fn main_network(state: Arc<Mutex<NetworkState>>) -> Result<(), PluginE
.await
.into_iter()
.collect::<Result<Vec<_>, _>>()
- .map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ .map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
}
diff --git a/plugins/plugin_sysstat/src/main/process.rs b/plugins/plugin_sysstat/src/main/process.rs
index cb8fe5c1..27ed4183 100644
--- a/plugins/plugin_sysstat/src/main/process.rs
+++ b/plugins/plugin_sysstat/src/main/process.rs
@@ -103,7 +103,7 @@ pub async fn main_process(state: Arc<Mutex<ProcessState>>) -> Result<(), PluginE
.await
.into_iter()
.collect::<Result<Vec<_>, _>>()
- .map_err(|_| PluginError::from(anyhow::anyhow!("Failed to send measurement")))
+ .map_err(|_| PluginError::from(miette::miette!("Failed to send measurement")))
.map(|_| ())
}
diff --git a/plugins/plugin_sysstat/src/plugin.rs b/plugins/plugin_sysstat/src/plugin.rs
index c9ef36d9..a7ae666a 100644
--- a/plugins/plugin_sysstat/src/plugin.rs
+++ b/plugins/plugin_sysstat/src/plugin.rs
@@ -98,7 +98,7 @@ impl Plugin for SysStatPlugin {
while let Some(stopper) = self.stoppers.pop() {
stopper
.stop()
- .map_err(|_| anyhow::anyhow!("Failed to stop mainloop"))?
+ .map_err(|_| miette::miette!("Failed to stop mainloop"))?
}
Ok(())