diff --git a/config.toml b/config.toml index d9ba1c8..782ff22 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,6 @@ [global] period = 1 +socket = "/var/run/collectd-unixsock" [[graph]] name = "cpu load" diff --git a/waybar-collectd/src/config.rs b/waybar-collectd/src/config.rs index 8146e33..983b594 100644 --- a/waybar-collectd/src/config.rs +++ b/waybar-collectd/src/config.rs @@ -11,6 +11,7 @@ pub struct Config { #[derive(Debug, Deserialize)] pub struct Global { pub period: f32, + pub socket: String, } #[derive(Debug, Deserialize)] diff --git a/waybar-collectd/src/main.rs b/waybar-collectd/src/main.rs index dc5bb6b..b660549 100644 --- a/waybar-collectd/src/main.rs +++ b/waybar-collectd/src/main.rs @@ -19,9 +19,8 @@ struct Cli { fn main() { let args = Cli::parse(); - if let Ok(mut proto) = Protocol::new("/var/run/collectd-unixsock") { - let config = parse(&args.config); - + let config = parse(&args.config); + if let Ok(mut proto) = Protocol::new(&config.global.socket) { let graphs = config .graph .iter()