pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 23:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix (workaround) for "cannot read property 'toFixed' of null" (#297)

Browse Source 
* fix (workaround) for NaN CPU usage

* cargo fmt --all
This commit is contained in:
Svyatoslav Nikolsky
2020-08-20 11:47:33 +03:00
committed by Bastian Köcher
parent 1823923a79
commit aa90d16832
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/relays/ethereum/src/metrics.rs
+14 -4
View File
@@ -18,7 +18,7 @@ pub use substrate_prometheus_endpoint::{register, Counter, CounterVec, Gauge, Ga
use std::net::SocketAddr; use std::net::SocketAddr;
use substrate_prometheus_endpoint::init_prometheus; use substrate_prometheus_endpoint::init_prometheus;
use sysinfo::{ProcessExt, System, SystemExt}; use sysinfo::{ProcessExt, RefreshKind, System, SystemExt};
/// Prometheus endpoint MetricsParams. /// Prometheus endpoint MetricsParams.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -111,7 +111,7 @@ impl GlobalMetrics {
/// Creates global metrics. /// Creates global metrics.
pub fn new() -> Self { pub fn new() -> Self {
GlobalMetrics { GlobalMetrics {
system: System::new(), system: System::new_with_specifics(RefreshKind::everything()),
system_average_load: GaugeVec::new(Opts::new("system_average_load", "System load average"), &["over"]) system_average_load: GaugeVec::new(Opts::new("system_average_load", "System load average"), &["over"])
.expect("metric is static and thus valid; qed"), .expect("metric is static and thus valid; qed"),
process_cpu_usage_percentage: Gauge::new("process_cpu_usage_percentage", "Process CPU usage") process_cpu_usage_percentage: Gauge::new("process_cpu_usage_percentage", "Process CPU usage")
@@ -141,8 +141,18 @@ impl GlobalMetrics {
let is_process_refreshed = self.system.refresh_process(pid); let is_process_refreshed = self.system.refresh_process(pid);
match (is_process_refreshed, self.system.get_process(pid)) { match (is_process_refreshed, self.system.get_process(pid)) {
(true, Some(process_info)) => { (true, Some(process_info)) => {
self.process_cpu_usage_percentage.set(process_info.cpu_usage() as f64); let cpu_usage = process_info.cpu_usage() as f64;
self.process_memory_usage_bytes.set(process_info.memory() * 1024); let memory_usage = process_info.memory() * 1024;
log::trace!(
target: "bridge-metrics",
"Refreshed process metrics: CPU={}, memory={}",
cpu_usage,
memory_usage,
);
self.process_cpu_usage_percentage
.set(if cpu_usage.is_finite() { cpu_usage } else { 0f64 });
self.process_memory_usage_bytes.set(memory_usage);
} }
_ => { _ => {
log::warn!( log::warn!(