diff --git a/backend/api_server/src/blog/mod.rs b/backend/api_server/src/blog/mod.rs index abfb8e6..06ac819 100644 --- a/backend/api_server/src/blog/mod.rs +++ b/backend/api_server/src/blog/mod.rs @@ -1,5 +1,4 @@ mod api; -mod scheduler; use crate::blog::api::{ get_page_count::get_page_count, get_post::get_post, get_post_list::get_post_list, diff --git a/backend/api_server/src/main.rs b/backend/api_server/src/main.rs index 7187196..520be42 100644 --- a/backend/api_server/src/main.rs +++ b/backend/api_server/src/main.rs @@ -1,6 +1,7 @@ mod blog; mod init; mod logger; +mod scheduler; mod server; #[tokio::main] diff --git a/backend/api_server/src/blog/scheduler/mod.rs b/backend/api_server/src/scheduler/mod.rs similarity index 97% rename from backend/api_server/src/blog/scheduler/mod.rs rename to backend/api_server/src/scheduler/mod.rs index ef73764..018cd5c 100644 --- a/backend/api_server/src/blog/scheduler/mod.rs +++ b/backend/api_server/src/scheduler/mod.rs @@ -1,4 +1,4 @@ -use crate::blog::{ +use crate::{ scheduler::scheduler_error::SchedulerError, scheduler::scheduler_error::SchedulerError::IdAlreadyRunning, scheduler::scheduler_error::SchedulerError::IdNotFound, scheduler::sleeper::SkippableSleeper, @@ -163,8 +163,8 @@ impl Scheduler { #[cfg(test)] mod tests { - use crate::blog::scheduler::tasks::basic::BasicTask; - use crate::blog::scheduler::Scheduler; + use crate::scheduler::tasks::basic::BasicTask; + use crate::scheduler::Scheduler; use std::error::Error; use std::thread; use std::time::Duration; diff --git a/backend/api_server/src/blog/scheduler/scheduler_error.rs b/backend/api_server/src/scheduler/scheduler_error.rs similarity index 93% rename from backend/api_server/src/blog/scheduler/scheduler_error.rs rename to backend/api_server/src/scheduler/scheduler_error.rs index 54615be..43f30dd 100644 --- a/backend/api_server/src/blog/scheduler/scheduler_error.rs +++ b/backend/api_server/src/scheduler/scheduler_error.rs @@ -1,4 +1,4 @@ -use crate::blog::scheduler::scheduler_error::SchedulerError::MutexPoison; +use crate::scheduler::scheduler_error::SchedulerError::MutexPoison; use std::error::Error; use std::fmt::{Debug, Display, Formatter}; use std::sync::PoisonError; diff --git a/backend/api_server/src/blog/scheduler/sleeper.rs b/backend/api_server/src/scheduler/sleeper.rs similarity index 97% rename from backend/api_server/src/blog/scheduler/sleeper.rs rename to backend/api_server/src/scheduler/sleeper.rs index dd84bd6..4155e57 100644 --- a/backend/api_server/src/blog/scheduler/sleeper.rs +++ b/backend/api_server/src/scheduler/sleeper.rs @@ -54,7 +54,7 @@ impl From> for SkippableSleeper { #[cfg(test)] mod test { - use crate::blog::scheduler::sleeper::SkippableSleeper; + use crate::scheduler::sleeper::SkippableSleeper; use std::thread; use std::time::Duration; diff --git a/backend/api_server/src/blog/scheduler/task_func.rs b/backend/api_server/src/scheduler/task_func.rs similarity index 100% rename from backend/api_server/src/blog/scheduler/task_func.rs rename to backend/api_server/src/scheduler/task_func.rs diff --git a/backend/api_server/src/blog/scheduler/tasks/basic.rs b/backend/api_server/src/scheduler/tasks/basic.rs similarity index 86% rename from backend/api_server/src/blog/scheduler/tasks/basic.rs rename to backend/api_server/src/scheduler/tasks/basic.rs index d18e60c..0318899 100644 --- a/backend/api_server/src/blog/scheduler/tasks/basic.rs +++ b/backend/api_server/src/scheduler/tasks/basic.rs @@ -1,5 +1,5 @@ -use crate::blog::scheduler::task_func::TaskFunc; -use crate::blog::scheduler::tasks::Task; +use crate::scheduler::task_func::TaskFunc; +use crate::scheduler::tasks::Task; use chrono::{DateTime, Utc}; use cron::Schedule; use std::error::Error; diff --git a/backend/api_server/src/blog/scheduler/tasks/mod.rs b/backend/api_server/src/scheduler/tasks/mod.rs similarity index 76% rename from backend/api_server/src/blog/scheduler/tasks/mod.rs rename to backend/api_server/src/scheduler/tasks/mod.rs index 898bc9e..7e3b87a 100644 --- a/backend/api_server/src/blog/scheduler/tasks/mod.rs +++ b/backend/api_server/src/scheduler/tasks/mod.rs @@ -1,4 +1,3 @@ -use crate::blog::scheduler::task_func::TaskFunc; use chrono::{DateTime, Utc}; pub mod basic;