rmanach/deployer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean code

Browse Source
This commit is contained in:
rmanach 2023-04-18 14:37:38 +02:00
parent 8a0fd00fb9
commit b8e1afc679
2 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/model/job.rs
View File

@ -28,46 +28,32 @@ impl Job {
}
}
pub fn set_status(&mut self, status: RunnerStatus) {
self.status = status;
fn deploy_megaport(&mut self) {
self.set_status(RunnerStatus::Running);
println!(
"[job({} - {:?} - {:?})] deploying megaport...",
self.id, self.action, self.status
);
let wait = time::Duration::from_millis(5);
thread::sleep(wait);
self.set_status(RunnerStatus::Success);
println!(
"[job({} - {:?} - {:?})] megaport deployed",
self.id, self.action, self.status
);
}
}
impl Runner for Job {
fn run(&mut self) {
self.set_status(RunnerStatus::Running);
match self.action {
JobAction::MegaportDeploy => {
println!(
"[job({} - {:?} - {:?})] deploying megaport...",
self.id, self.action, self.status
);
JobAction::MegaportDeploy => self.deploy_megaport(),
JobAction::MegaportUndeploy => todo!(),
JobAction::MegaportCheckDeploy => todo!(),
JobAction::MegaportCheckUndeploy => todo!(),
}
JobAction::MegaportUndeploy => {
println!(
"[job({} - {:?} - {:?})] undeploying megaport...",
self.id, self.action, self.status
);
}
JobAction::MegaportCheckDeploy => {
println!(
"[job({} - {:?} - {:?})] checking megaport deployement...",
self.id, self.action, self.status
);
}
JobAction::MegaportCheckUndeploy => {
println!(
"[job({} - {:?} - {:?})] checking megaport undeployement...",
self.id, self.action, self.status
);
}
}
let wait = time::Duration::from_millis(1);
thread::sleep(wait);
self.set_status(RunnerStatus::Success);
}
fn set_status(&mut self, status: RunnerStatus) {

33
src/worker/worker.rs
View File

@ -18,7 +18,7 @@ impl<T> Queue<T> {
}
}
#[derive(Copy, Clone, PartialEq)]
#[derive(Debug, Copy, Clone, PartialEq)]
#[allow(dead_code)]
pub enum WorkerStatus {
Pending,
@ -27,12 +27,16 @@ pub enum WorkerStatus {
}
struct Worker {
id: u32,
manager: String,
status: WorkerStatus,
}
impl Worker {
fn new() -> Self {
fn new(id: u32, manager: String) -> Self {
Self {
id: id,
manager: manager,
status: WorkerStatus::Pending,
}
}
@ -64,12 +68,11 @@ impl<T: Runner + std::marker::Send + 'static> Manager<T> {
pub fn launch_workers(&mut self, nb_workers: u32) {
for i in 0..nb_workers {
let shared_worker = Arc::new(Mutex::new(Worker::new()));
let shared_worker = Arc::new(Mutex::new(Worker::new(i, self.name.clone())));
self.workers.push(shared_worker.clone());
let worker = shared_worker.clone();
let queue = self.queue.clone();
let name = self.name.clone();
thread::spawn(move || loop {
let mut guard = queue.content.lock().unwrap();
@ -84,17 +87,9 @@ impl<T: Runner + std::marker::Send + 'static> Manager<T> {
drop(guard);
let mut guard = worker.lock().unwrap();
guard.set_status(WorkerStatus::Running);
drop(guard);
println!("[worker({} - {})] launching job...", name, i);
Manager::<T>::set_worker_status(&worker, WorkerStatus::Running);
runner.run();
println!("[worker({} - {})] job done", name, i);
let mut guard = worker.lock().unwrap();
guard.set_status(WorkerStatus::Pending);
drop(guard);
Manager::<T>::set_worker_status(&worker, WorkerStatus::Pending);
});
}
}
@ -114,4 +109,14 @@ impl<T: Runner + std::marker::Send + 'static> Manager<T> {
}
true
}
fn set_worker_status(worker: &Arc<Mutex<Worker>>, status: WorkerStatus) {
let mut guard = worker.lock().unwrap();
guard.set_status(status);
println!(
"[worker({} - {})] status: {:?}",
guard.manager, guard.id, guard.status
);
}
}