Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuxiujia committed Aug 4, 2022
2 parents 65fc020 + 4db9529 commit 25984ca
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 288 deletions.
4 changes: 1 addition & 3 deletions src/appender.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
use crate::appender::Command::CommandRecord;
use crate::date;
use crossbeam_utils::sync::WaitGroup;
use log::LevelFilter;
use std::ops::{Add, Sub};
use std::time::{Duration, SystemTime};
use std::time::{SystemTime};

/// LogAppender append logs
/// Appender will be running on single main thread,please do_log for new thread or new an Future
Expand Down
281 changes: 0 additions & 281 deletions src/date.rs

This file was deleted.

4 changes: 2 additions & 2 deletions src/fast_log.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use log::{LevelFilter, Log, Metadata, Record};
use std::ops::{Deref, DerefMut};
use std::ops::{Deref};
use std::sync::atomic::{AtomicI32, AtomicI64, Ordering};

use crate::appender::{Command, FastLogRecord, RecordFormat};
use crate::appender::{Command, FastLogRecord};
use crate::config::Config;
use crate::error::LogError;
use crate::filter::Filter;
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pub mod appender;
pub mod bencher;
pub mod config;
pub mod consts;
pub mod date;
pub mod error;
pub mod fast_log;
pub mod filter;
Expand Down
1 change: 0 additions & 1 deletion src/plugin/file_split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::appender::{Command, FastLogRecord, LogAppender};
use crate::consts::LogSize;
use crate::error::LogError;
use crate::{chan, Receiver, Sender};
use std::ops::Sub;
use std::str::FromStr;
use std::time::Duration;

Expand Down

0 comments on commit 25984ca

Please sign in to comment.