From bcc673b74bc8437071d4c46bf21a051b288273bb Mon Sep 17 00:00:00 2001
From: _ <_@_>
Date: Sun, 20 Dec 2020 17:32:13 -0600
Subject: [PATCH] :recycle: refactor: extract metrics monitor function and add
 it to ptth_server

---
 crates/ptth_file_server_bin/src/main.rs       | 38 +--------------
 crates/ptth_server/src/file_server/metrics.rs | 47 ++++++++++++++++++-
 crates/ptth_server/src/lib.rs                 |  5 ++
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/crates/ptth_file_server_bin/src/main.rs b/crates/ptth_file_server_bin/src/main.rs
index b92d6e9..cd8f82c 100644
--- a/crates/ptth_file_server_bin/src/main.rs
+++ b/crates/ptth_file_server_bin/src/main.rs
@@ -100,44 +100,8 @@ async fn main () -> Result <(), anyhow::Error> {
 	let metrics_interval = Arc::new (ArcSwap::default ());
 	
 	let interval_writer = Arc::clone (&metrics_interval);
-	
 	tokio::spawn (async move {
-		use std::time::Duration;
-		
-		use uom::si::ratio::percent;
-		
-		let mut interval = tokio::time::interval (Duration::from_secs (60));
-		
-		let mut counter = 0_u64;
-		let mut next_10_time = counter;
-		let mut metrics_at_last_10: Arc <Option <metrics::Interval>> = Arc::new (None);
-		
-		loop {
-			interval.tick ().await;
-			
-			let new_interval_metrics = match file_server::metrics::Interval::new ().await {
-				Err (e) => {
-					error! ("Failed to update interval metrics: {:?}", e);
-					continue;
-				},
-				Ok (x) => x,
-			};
-			let new_interval_metrics = Arc::new (Some (new_interval_metrics));
-			
-			if counter >= next_10_time {
-				if let (Some (old), Some (new)) = (&*metrics_at_last_10, &*new_interval_metrics) {
-					let diff = new.cpu_usage.clone () - old.cpu_usage.clone ();
-					trace! ("CPU usage: {}%", diff.get::<percent> ());
-				}
-				
-				next_10_time += 1;
-				metrics_at_last_10 = new_interval_metrics.clone ();
-			}
-			
-			interval_writer.store (new_interval_metrics);
-			counter += 1;
-			//trace! ("interval metrics 1");
-		}
+		file_server::metrics::Interval::monitor (interval_writer).await;
 	});
 	
 	let state = Arc::new (State {
diff --git a/crates/ptth_server/src/file_server/metrics.rs b/crates/ptth_server/src/file_server/metrics.rs
index 6dd7a9d..458e6b6 100644
--- a/crates/ptth_server/src/file_server/metrics.rs
+++ b/crates/ptth_server/src/file_server/metrics.rs
@@ -1,5 +1,10 @@
+use std::sync::Arc;
+
+use arc_swap::ArcSwap;
 use chrono::{DateTime, Utc};
-use tracing::debug;
+use tracing::{
+	debug, error, trace,
+};
 use ulid::Ulid;
 
 // Metrics are named for when they're updated:
@@ -96,6 +101,46 @@ impl Interval {
 		
 		Ok (x)
 	}
+	
+	pub async fn monitor (interval_writer: Arc <ArcSwap <Option <Interval>>>)
+	{
+		use std::time::Duration;
+		
+		use uom::si::ratio::percent;
+		
+		let mut interval = tokio::time::interval (Duration::from_secs (4));
+		
+		let mut counter = 0_u64;
+		let mut next_10_time = counter;
+		let mut metrics_at_last_10: Arc <Option <Interval>> = Arc::new (None);
+		
+		loop {
+			interval.tick ().await;
+			
+			let new_interval_metrics = match Interval::new ().await {
+				Err (e) => {
+					error! ("Failed to update interval metrics: {:?}", e);
+					continue;
+				},
+				Ok (x) => x,
+			};
+			let new_interval_metrics = Arc::new (Some (new_interval_metrics));
+			
+			if counter >= next_10_time {
+				if let (Some (old), Some (new)) = (&*metrics_at_last_10, &*new_interval_metrics) {
+					let diff = new.cpu_usage.clone () - old.cpu_usage.clone ();
+					trace! ("CPU usage: {}%", diff.get::<percent> ());
+				}
+				
+				next_10_time += 1;
+				metrics_at_last_10 = new_interval_metrics.clone ();
+			}
+			
+			interval_writer.store (new_interval_metrics);
+			counter += 1;
+			//trace! ("interval metrics 1");
+		}
+	}
 }
 
 fn get_machine_id () -> Option <String> {
diff --git a/crates/ptth_server/src/lib.rs b/crates/ptth_server/src/lib.rs
index 64d5eff..c5a89d6 100644
--- a/crates/ptth_server/src/lib.rs
+++ b/crates/ptth_server/src/lib.rs
@@ -203,6 +203,11 @@ pub async fn run_server (
 	let metrics_startup = file_server::metrics::Startup::new (config_file.name);
 	let metrics_interval = Arc::new (ArcSwap::default ());
 	
+	let interval_writer = Arc::clone (&metrics_interval);
+	tokio::spawn (async move {
+		file_server::metrics::Interval::monitor (interval_writer).await;
+	});
+	
 	let state = Arc::new (State {
 		file_server: file_server::State {
 			config: file_server::Config {