niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: spawnid typo

Browse Source
This commit is contained in:
Jack Wills
2022-07-23 10:18:00 +00:00
parent 1ae95d58c3
commit 8a3df33dfa
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/docker_data/mod.rs
+16 -23
View File
@@ -6,10 +6,11 @@ use futures_util::StreamExt;
use parking_lot::Mutex; use parking_lot::Mutex;
use std::{ use std::{
collections::HashMap, collections::HashMap,
fmt,
sync::{ sync::{
atomic::{AtomicBool, Ordering}, atomic::{AtomicBool, Ordering},
Arc, Arc,
}, fmt, },
}; };
use tokio::{sync::mpsc::Receiver, task::JoinHandle}; use tokio::{sync::mpsc::Receiver, task::JoinHandle};
@@ -23,16 +24,16 @@ mod message;
pub use message::DockerMessage; pub use message::DockerMessage;
#[derive(Debug, Hash, Clone, PartialEq, Eq)] #[derive(Debug, Hash, Clone, PartialEq, Eq)]
enum SpawnId{ enum SpawnId {
Stats(String), Stats(String),
Log(String) Log(String),
} }
impl fmt::Display for SpawnId { impl fmt::Display for SpawnId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let disp = match self { let disp = match self {
Self::Stats(id) => format!("stats::{id}"), Self::Stats(id) => format!("stats::{id}"),
Self::Log(id) => format!("logs::{id}") Self::Log(id) => format!("logs::{id}"),
}; };
write!(f, "{}", disp) write!(f, "{}", disp)
} }
@@ -133,7 +134,7 @@ impl DockerData {
.lock() .lock()
.update_stats(id.clone(), None, None, mem_limit, rx, tx); .update_stats(id.clone(), None, None, mem_limit, rx, tx);
} }
let key = SpawnId::Stats(id.to_owned()); let key = SpawnId::Stats(id.to_owned());
spawns.lock().remove(&key); spawns.lock().remove(&key);
} }
} }
@@ -147,7 +148,7 @@ impl DockerData {
let is_running = *is_running; let is_running = *is_running;
let id = id.to_owned(); let id = id.to_owned();
let key = SpawnId::Stats(id.to_owned()); let key = SpawnId::Stats(id.to_owned());
let spawn_contains_id = spawns.lock().contains_key(&key); let spawn_contains_id = spawns.lock().contains_key(&key);
let s = tokio::spawn(Self::update_container_stat( let s = tokio::spawn(Self::update_container_stat(
docker, docker,
@@ -229,7 +230,7 @@ impl DockerData {
} }
} }
} }
let key = SpawnId::Log(id.to_owned()); let key = SpawnId::Log(id.to_owned());
spawns.lock().remove(&key); spawns.lock().remove(&key);
app_data.lock().update_log_by_id(output, id.to_owned()); app_data.lock().update_log_by_id(output, id.to_owned());
} }
@@ -242,15 +243,12 @@ impl DockerData {
let id = id.to_owned(); let id = id.to_owned();
let app_data = Arc::clone(&self.app_data); let app_data = Arc::clone(&self.app_data);
let spawns = Arc::clone(&self.spawns); let spawns = Arc::clone(&self.spawns);
let key = SpawnId::Log(id.to_owned()); let key = SpawnId::Log(id.to_owned());
let s = tokio::spawn(Self::update_log( let s = tokio::spawn(Self::update_log(
docker, id, timestamps, 0, app_data, spawns, docker, id, timestamps, 0, app_data, spawns,
)); ));
self.spawns.lock().insert( self.spawns.lock().insert(key, s);
key,
s
);
} }
} }
@@ -260,7 +258,7 @@ let s = tokio::spawn(Self::update_log(
if let Some(index) = optional_index { if let Some(index) = optional_index {
let id = self.app_data.lock().containers.items[index].id.to_owned(); let id = self.app_data.lock().containers.items[index].id.to_owned();
let key = SpawnId::Log(id.to_owned()); let key = SpawnId::Log(id.to_owned());
let running = self.spawns.lock().contains_key(&key); let running = self.spawns.lock().contains_key(&key);
if !running { if !running {
@@ -271,12 +269,7 @@ let s = tokio::spawn(Self::update_log(
let app_data = Arc::clone(&self.app_data); let app_data = Arc::clone(&self.app_data);
let spawns = Arc::clone(&self.spawns); let spawns = Arc::clone(&self.spawns);
let s = tokio::spawn(Self::update_log( let s = tokio::spawn(Self::update_log(
docker, docker, id, timestamps, since, app_data, spawns,
id,
timestamps,
since,
app_data,
spawns,
)); ));
self.spawns.lock().insert(key, s); self.spawns.lock().insert(key, s);
} }