Use fields instead of cells

Author: therustmonk

Cargo.lock

@@ -8,7 +8,6 @@ anyhow = "1.0.44"
 async-trait = "0.1.51"
 log = "0.4.14"
 meio = "0.95.1"
-once_cell = "1.8.0"
 rate-config = "0.40.0"
 reqwest = "0.11.4"
 rillrate = "0.40.0"

tools/monitor/Cargo.toml

@@ -8,23 +8,21 @@ use anyhow::Error;
 use async_trait::async_trait;
 use meio::task::HeartBeatHandle;
 use meio::{Actor, Context, InterruptedBy, StartedBy};
-use once_cell::sync::OnceCell;
 use rillrate::prime::*;
 use std::sync::Arc;
 use std::time::Duration;
 
-// TODO: Use local fields instead
-static LATENCY: OnceCell<String> = OnceCell::new();
-static TAIL: OnceCell<String> = OnceCell::new();
-static INTERVAL: OnceCell<String> = OnceCell::new();
-
 pub struct Watcher {
     name: String,
     url: Arc<String>,
     latency: Pulse,
     tail: LiveTail,
     interval: Slider,
     handle: HeartBeatHandle,
+
+    latency_entry: String,
+    tail_entry: String,
+    interval_entry: String,
 }
 
 impl Actor for Watcher {
@@ -33,9 +31,9 @@ impl Actor for Watcher {
 
 impl Watcher {
     pub fn new(name: String, url: String) -> Self {
-        LATENCY.set(format!("site.{}.latency.pulse", name)).unwrap();
+        let latency_entry = format!("site.{}.latency.pulse", name);
         let latency = Pulse::new(
-            LATENCY.get().unwrap().as_ref(),
+            latency_entry.as_ref(),
             Default::default(),
             PulseOpts::default()
                 .retain(30u32)
@@ -44,17 +42,15 @@ impl Watcher {
                 .higher(true)
                 .suffix("ms"),
         );
-        TAIL.set(format!("site.{}.latency.events", name)).unwrap();
+        let tail_entry = format!("site.{}.latency.events", name);
         let tail = LiveTail::new(
-            TAIL.get().unwrap().as_ref(),
+            tail_entry.as_ref(),
             Default::default(),
             LiveTailOpts::default(),
         );
-        INTERVAL
-            .set(format!("site.{}.settings.interval", name))
-            .unwrap();
+        let interval_entry = format!("site.{}.settings.interval", name);
         let interval = Slider::new(
-            INTERVAL.get().unwrap().as_ref(),
+            interval_entry.as_ref(),
             SliderOpts::default()
                 .label("Slide Me!")
                 .min(1)
@@ -71,6 +67,9 @@ impl Watcher {
             tail,
             interval,
             handle,
+            latency_entry,
+            tail_entry,
+            interval_entry,
         }
     }
 }

tools/monitor/src/actors/watcher/actor.rs

@@ -3,11 +3,11 @@ use rillrate::basis::{Layout, LayoutTab};
 
 impl Watcher {
     pub fn register_layout(&mut self) {
-        let mut layout = Layout::new(self.name.as_ref());
-        let mut tab = LayoutTab::new("Latency");
-        tab.add_item((0, 0), (20, 30), LATENCY.get().unwrap().as_ref());
-        tab.add_item((0, 30), (20, 30), TAIL.get().unwrap().as_ref());
-        tab.add_item((0, 60), (20, 30), INTERVAL.get().unwrap().as_ref());
+        let mut layout = Layout::new("Monitor");
+        let mut tab = LayoutTab::new(self.name.as_ref());
+        tab.add_item((0, 0), (60, 40), self.tail_entry.as_ref());
+        tab.add_item((60, 0), (40, 40), self.latency_entry.as_ref());
+        tab.add_item((0, 60), (20, 30), self.interval_entry.as_ref());
         layout.add_tab(tab);
         layout.register();
     }