From 8b123cd59319cf9ba77109ed7f9cfa2d870a7c5e Mon Sep 17 00:00:00 2001 From: prplV Date: Fri, 27 Dec 2024 13:47:54 +0300 Subject: [PATCH] import refactor --- noxis-rs/src/options/cli_pipeline.rs | 7 ++----- noxis-rs/src/options/config.rs | 2 +- noxis-rs/src/options/signals.rs | 2 +- noxis-rs/src/utils/files.rs | 2 +- noxis-rs/src/utils/metrics.rs | 2 +- noxis-rs/src/utils/services.rs | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/noxis-rs/src/options/cli_pipeline.rs b/noxis-rs/src/options/cli_pipeline.rs index 1b73624..3b9897c 100644 --- a/noxis-rs/src/options/cli_pipeline.rs +++ b/noxis-rs/src/options/cli_pipeline.rs @@ -20,7 +20,7 @@ use tokio::io::{BufReader, AsyncWriteExt, AsyncBufReadExt}; /// *depends on* : - /// pub async fn init_cli_pipeline() -> DynResult<()> { - return match init_listener().await { + match init_listener().await { Some(list) => { loop { if let Ok((socket, addr)) = list.accept().await { @@ -53,7 +53,7 @@ pub async fn init_cli_pipeline() -> DynResult<()> { /// *depends on* : `tokio::net::TcpListener` /// async fn init_listener() -> Option { - return match TcpListener::bind("127.0.0.1:7753").await { + match TcpListener::bind("127.0.0.1:7753").await { Ok(listener) => { info!("Runner is listening localhost:7753"); Some(listener) @@ -79,9 +79,6 @@ async fn init_listener() -> Option { /// *depends on* : `tokio::net::TcpStream` /// async fn process_connection(mut stream: TcpStream) { - // loop{ - // stream. - // } let buf_reader = BufReader::new(stream.borrow_mut()); let mut rqst = buf_reader.lines(); diff --git a/noxis-rs/src/options/config.rs b/noxis-rs/src/options/config.rs index 65b4731..5ebe5bb 100644 --- a/noxis-rs/src/options/config.rs +++ b/noxis-rs/src/options/config.rs @@ -1,4 +1,4 @@ -use crate::options::structs::*; +use super::structs::*; use log::{error, info, warn}; use redis::{Client, Connection}; use std::fs::OpenOptions; diff --git a/noxis-rs/src/options/signals.rs b/noxis-rs/src/options/signals.rs index c107c74..7604bde 100644 --- a/noxis-rs/src/options/signals.rs +++ b/noxis-rs/src/options/signals.rs @@ -1,4 +1,4 @@ -use crate::options::structs::CustomError; +use super::structs::CustomError; use std::sync::Arc; use tokio::io; use tokio::sync::mpsc; diff --git a/noxis-rs/src/utils/files.rs b/noxis-rs/src/utils/files.rs index 28346c2..639ced2 100644 --- a/noxis-rs/src/utils/files.rs +++ b/noxis-rs/src/utils/files.rs @@ -1,5 +1,5 @@ use crate::options::structs::{CustomError, Files}; -use crate::utils::prcs::{is_active, is_frozen}; +use super::prcs::{is_active, is_frozen}; use inotify::{EventMask, Inotify, WatchMask}; use std::borrow::BorrowMut; use std::path::Path; diff --git a/noxis-rs/src/utils/metrics.rs b/noxis-rs/src/utils/metrics.rs index 0648a3e..756e44b 100644 --- a/noxis-rs/src/utils/metrics.rs +++ b/noxis-rs/src/utils/metrics.rs @@ -7,7 +7,7 @@ use crate::options::structs::TrackingProcess; use sysinfo::{Process, System}; use tokio::join; use crate::options::structs::{ProcessMetrics, ContainerMetrics}; -use crate::utils::get_container_id; +use super::get_container_id; // use pcap::{Device, Capture, Active}; // use std::net::Ipv4Addr; // use anyhow::{Result, Ok}; diff --git a/noxis-rs/src/utils/services.rs b/noxis-rs/src/utils/services.rs index d89ee6b..fb51f7d 100644 --- a/noxis-rs/src/utils/services.rs +++ b/noxis-rs/src/utils/services.rs @@ -1,5 +1,5 @@ use crate::options::structs::{CustomError, Services}; -use crate::utils::prcs::{is_active, is_frozen}; +use super::prcs::{is_active, is_frozen}; use log::{error, warn}; use std::net::{TcpStream, ToSocketAddrs}; use std::sync::Arc;