Skip to content

refactor: Remove unused log modules, enhanced log! macro #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaLaw2 merged 1 commit into from
Sep 11, 2025
Merged

refactor: Remove unused log modules, enhanced log! macro #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions macros/src/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub fn log_impl(input: TokenStream) -> TokenStream {
if let Some(debug_info) = &input.debug_info {
quote! {
{
let error = #error_expr;
let error = &#error_expr;
let level = error.level();
let message = error.to_string();
let debug_info = #debug_info;
Expand All @@ -48,7 +48,7 @@ pub fn log_impl(input: TokenStream) -> TokenStream {
} else {
quote! {
{
let error = #error_expr;
let error = &#error_expr;
let level = error.level();
let message = error.to_string();

Expand Down
5 changes: 2 additions & 3 deletions src/core/backup/backup_engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use tokio::sync::oneshot;
use tokio::task::JoinHandle;
use tracing::error;
use uuid::Uuid;
use crate::model::core::gui::communication::{ExecutionErrors, ExecutionProgress, FolderProcess};

Expand Down Expand Up @@ -272,7 +271,7 @@ impl ExecutionRunner {
.publish_event::<ExecutionErrors>(event)
.await
{
error!("{}", err);
log!(err);
Comment thread
DaLaw2 marked this conversation as resolved.
}
}
}
Expand All @@ -286,7 +285,7 @@ impl ExecutionRunner {
.save_execution(execution.uuid, current_level, errors)
.await
{
error!("{}", err);
log!(err);
}
break;
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/core/schedule/schedule_timer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ use crate::model::error::Error;
use async_trait::async_trait;
use chrono::{Duration, Utc};
use std::sync::Arc;
use macros::log;
use tokio::select;
use tokio::sync::Notify;
use tokio::sync::oneshot;
use tokio::time::sleep;
use tracing::error;

pub struct ScheduleTimer {
app_config: Arc<AppConfig>,
Expand Down Expand Up @@ -82,7 +82,7 @@ impl Runnable for ScheduleTimer {
Ok(Some(duration)) => duration,
Ok(None) => Duration::seconds(self.app_config.default_wakeup_time),
Err(err) => {
error!("{}", err);
log!(err);
Duration::seconds(self.app_config.default_wakeup_time)
}
};
Expand All @@ -99,7 +99,7 @@ impl Runnable for ScheduleTimer {
.send_command(ScheduleManagerCommand::ExecuteReadySchedules)
.await
{
error!("{}", err);
log!(err);
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/model/error/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::model::error::misc::MiscError;
use crate::model::error::system::SystemError;
use crate::model::error::task::TaskError;
use serde::{Deserialize, Serialize};
use tracing::Level;

#[derive(Clone, Debug, thiserror::Error, Serialize, Deserialize)]
pub enum Error {
Expand All @@ -25,6 +26,18 @@ pub enum Error {
Task(TaskError),
}

impl Error {
pub fn level(&self) -> Level {
match self {
Error::Database(err) => err.level(),
Error::IO(err) => err.level(),
Error::Misc(err) => err.level(),
Error::System(err) => err.level(),
Error::Task(err) => err.level(),
}
}
}

impl From<DatabaseError> for Error {
fn from(error: DatabaseError) -> Self {
Self::Database(error)
Expand Down
8 changes: 0 additions & 8 deletions src/model/log/event.rs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/model/log/io.rs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/model/log/misc.rs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/model/log/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
pub mod database;
pub mod event;
pub mod io;
pub mod misc;
pub mod system;
pub mod task;
8 changes: 0 additions & 8 deletions src/model/log/task.rs
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions src/ui/execution_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use std::collections::HashSet;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::{Duration, Instant};
use macros::log;
use tokio::sync::broadcast;
use tracing::error;
use uuid::Uuid;

pub struct ExecutionPage {
Expand Down Expand Up @@ -344,21 +344,21 @@ impl ExecutionPage {
BackupState::Pending => {
if ui.button("▶ Start").clicked() {
if let Err(err) = self.handle_start_execution(uuid) {
error!("{}", err);
log!(err);
}
}
}
BackupState::Suspended => {
if ui.button("▶ Resume").clicked() {
if let Err(err) = self.handle_resume_execution(uuid) {
error!("{}", err);
log!(err);
}
}
}
BackupState::Running => {
if ui.button("⏸ Pause").clicked() {
if let Err(err) = self.handle_suspend_execution(uuid) {
error!("{}", err);
log!(err);
}
}
}
Expand All @@ -367,7 +367,7 @@ impl ExecutionPage {

if ui.button("🗑").clicked() {
if let Err(err) = self.handle_remove_execution(uuid) {
error!("{}", err);
log!(err);
}
}
});
Expand Down Expand Up @@ -519,7 +519,7 @@ impl ExecutionPage {
self.reset_form();
}
Err(err) => {
error!("{}", err);
log!(err);
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/ui/schedule_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use futures::executor::block_on;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::{Duration, Instant};
use tracing::error;
use macros::log;
use uuid::Uuid;

pub struct SchedulePage {
Expand Down Expand Up @@ -105,7 +105,7 @@ impl SchedulePage {
self.schedules = schedules;
}
Err(err) => {
error!("{}", err);
log!(err);
}
}
}
Expand Down Expand Up @@ -322,21 +322,21 @@ impl SchedulePage {
ScheduleState::Active => {
if ui.button("⏸ Pause").clicked() {
if let Err(err) = self.handle_pause_schedule(schedule.uuid) {
error!("{}", err);
log!(err);
}
}
}
ScheduleState::Paused => {
if ui.button("▶ Resume").clicked() {
if let Err(err) = self.handle_active_schedule(schedule.uuid) {
error!("{}", err);
log!(err);
}
}
}
ScheduleState::Disabled => {
if ui.button("▶ Enable").clicked() {
if let Err(err) = self.handle_active_schedule(schedule.uuid) {
error!("{}", err);
log!(err);
}
}
}
Expand All @@ -346,13 +346,13 @@ impl SchedulePage {
&& ui.button("❌ Disable").clicked()
{
if let Err(err) = self.handle_disable_schedule(schedule.uuid) {
error!("{}", err);
log!(err);
}
}

if ui.button("🗑").clicked() {
if let Err(err) = self.handle_remove_schedule(schedule.uuid) {
error!("{}", err);
log!(err);
}
}
});
Expand Down Expand Up @@ -540,7 +540,7 @@ impl SchedulePage {
};

if let Err(err) = self.handle_add_schedule(schedule) {
error!("{}", err);
log!(err);
}

self.reset_schedule_form();
Expand Down Expand Up @@ -739,7 +739,7 @@ impl SchedulePage {
editing_schedule.updated_at = chrono::Utc::now().naive_utc();

if let Err(err) = self.handle_modify_schedule(editing_schedule) {
error!("{}", err);
log!(err);
}

self.reset_edit_schedule_form();
Expand Down Expand Up @@ -874,7 +874,7 @@ impl SchedulePage {

if run_now_clicked {
if let Err(err) = self.handle_run_schedule_now(schedule.clone()) {
error!("Failed to run schedule now: {}", err);
log!(err);
} else {
self.load_schedules();
}
Expand Down
Loading