remove unused dep and move job out
This commit is contained in:
@@ -13,9 +13,9 @@ use log::{debug, info, error};
|
||||
|
||||
use crate::supervisor::Supervisor;
|
||||
use crate::runner::{Runner, RunnerError};
|
||||
use crate::runner::{ProcessManagerError, ProcessStatus, LogInfo};
|
||||
use crate::job::Job;
|
||||
use crate::ProcessManagerType;
|
||||
use sal_service_manager::{ProcessStatus, LogInfo};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use std::net::SocketAddr;
|
||||
@@ -191,10 +191,12 @@ pub enum ProcessStatusWrapper {
|
||||
impl From<ProcessStatus> for ProcessStatusWrapper {
|
||||
fn from(status: ProcessStatus) -> Self {
|
||||
match status {
|
||||
ProcessStatus::Running => ProcessStatusWrapper::Running,
|
||||
ProcessStatus::Stopped => ProcessStatusWrapper::Stopped,
|
||||
ProcessStatus::NotStarted => ProcessStatusWrapper::Stopped,
|
||||
ProcessStatus::Starting => ProcessStatusWrapper::Starting,
|
||||
ProcessStatus::Running => ProcessStatusWrapper::Running,
|
||||
ProcessStatus::Stopping => ProcessStatusWrapper::Stopping,
|
||||
ProcessStatus::Stopped => ProcessStatusWrapper::Stopped,
|
||||
ProcessStatus::Failed => ProcessStatusWrapper::Error("Process failed".to_string()),
|
||||
ProcessStatus::Error(msg) => ProcessStatusWrapper::Error(msg),
|
||||
}
|
||||
}
|
||||
@@ -231,16 +233,6 @@ pub struct LogInfoWrapper {
|
||||
}
|
||||
|
||||
impl From<LogInfo> for LogInfoWrapper {
|
||||
fn from(log: LogInfo) -> Self {
|
||||
LogInfoWrapper {
|
||||
timestamp: log.timestamp,
|
||||
level: log.level,
|
||||
message: log.message,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<crate::runner::LogInfo> for LogInfoWrapper {
|
||||
fn from(log: crate::runner::LogInfo) -> Self {
|
||||
LogInfoWrapper {
|
||||
timestamp: log.timestamp,
|
||||
|
||||
Reference in New Issue
Block a user