Apply and configure rustfmt in the project
This commit is contained in:
parent
e19805f872
commit
ab587c98e4
3 changed files with 44 additions and 31 deletions
11
.travis.yml
11
.travis.yml
|
|
@ -1 +1,10 @@
|
||||||
language: rust
|
language: rust
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- rustup component add rustfmt-preview
|
||||||
|
|
||||||
|
script:
|
||||||
|
- cargo fmt --all -- --check
|
||||||
|
- cargo build
|
||||||
|
- cargo test
|
||||||
|
|
||||||
|
|
|
||||||
62
src/lib.rs
62
src/lib.rs
|
|
@ -1,45 +1,49 @@
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::SeekFrom;
|
|
||||||
use std::io::BufReader;
|
|
||||||
use std::io::prelude::*;
|
|
||||||
use std::io;
|
use std::io;
|
||||||
|
use std::io::prelude::*;
|
||||||
|
use std::io::BufReader;
|
||||||
|
use std::io::ErrorKind;
|
||||||
|
use std::io::SeekFrom;
|
||||||
|
use std::os::unix::fs::MetadataExt;
|
||||||
use std::thread::sleep;
|
use std::thread::sleep;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use std::os::unix::fs::MetadataExt;
|
|
||||||
use std::io::ErrorKind;
|
|
||||||
|
|
||||||
pub struct LogWatcher{
|
pub struct LogWatcher {
|
||||||
filename: String,
|
filename: String,
|
||||||
inode: u64,
|
inode: u64,
|
||||||
pos: u64,
|
pos: u64,
|
||||||
reader: BufReader<File>,
|
reader: BufReader<File>,
|
||||||
finish: bool
|
finish: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LogWatcher {
|
impl LogWatcher {
|
||||||
pub fn register(filename: String) -> Result<LogWatcher, io::Error> {
|
pub fn register(filename: String) -> Result<LogWatcher, io::Error> {
|
||||||
let f = match File::open(filename.clone()) {
|
let f = match File::open(filename.clone()) {
|
||||||
Ok(x) => x,
|
Ok(x) => x,
|
||||||
Err(err) => return Err(err)
|
Err(err) => return Err(err),
|
||||||
};
|
};
|
||||||
|
|
||||||
let metadata = match f.metadata() {
|
let metadata = match f.metadata() {
|
||||||
Ok(x) => x,
|
Ok(x) => x,
|
||||||
Err(err) => return Err(err)
|
Err(err) => return Err(err),
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut reader = BufReader::new(f);
|
let mut reader = BufReader::new(f);
|
||||||
let pos = metadata.len();
|
let pos = metadata.len();
|
||||||
reader.seek(SeekFrom::Start(pos)).unwrap();
|
reader.seek(SeekFrom::Start(pos)).unwrap();
|
||||||
Ok(LogWatcher{filename: filename,
|
Ok(LogWatcher {
|
||||||
inode: metadata.ino(),
|
filename: filename,
|
||||||
pos: pos,
|
inode: metadata.ino(),
|
||||||
reader: reader,
|
pos: pos,
|
||||||
finish: false})
|
reader: reader,
|
||||||
|
finish: false,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn reopen_if_log_rotated<F: ?Sized>(&mut self, callback: &F)
|
fn reopen_if_log_rotated<F: ?Sized>(&mut self, callback: &F)
|
||||||
where F: Fn(String) {
|
where
|
||||||
|
F: Fn(String),
|
||||||
|
{
|
||||||
loop {
|
loop {
|
||||||
match File::open(self.filename.clone()) {
|
match File::open(self.filename.clone()) {
|
||||||
Ok(x) => {
|
Ok(x) => {
|
||||||
|
|
@ -51,7 +55,7 @@ impl LogWatcher {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if metadata.ino() != self.inode{
|
if metadata.ino() != self.inode {
|
||||||
self.finish = true;
|
self.finish = true;
|
||||||
self.watch(callback);
|
self.watch(callback);
|
||||||
self.finish = false;
|
self.finish = false;
|
||||||
|
|
@ -59,14 +63,13 @@ impl LogWatcher {
|
||||||
self.reader = BufReader::new(f);
|
self.reader = BufReader::new(f);
|
||||||
self.pos = 0;
|
self.pos = 0;
|
||||||
self.inode = metadata.ino();
|
self.inode = metadata.ino();
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
sleep(Duration::new(1, 0));
|
sleep(Duration::new(1, 0));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
},
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
if err.kind() == ErrorKind::NotFound{
|
if err.kind() == ErrorKind::NotFound {
|
||||||
sleep(Duration::new(1, 0));
|
sleep(Duration::new(1, 0));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -76,27 +79,28 @@ impl LogWatcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn watch<F: ?Sized>(&mut self, callback: &F)
|
pub fn watch<F: ?Sized>(&mut self, callback: &F)
|
||||||
where F: Fn(String) {
|
where
|
||||||
loop{
|
F: Fn(String),
|
||||||
|
{
|
||||||
|
loop {
|
||||||
let mut line = String::new();
|
let mut line = String::new();
|
||||||
let resp = self.reader.read_line(&mut line);
|
let resp = self.reader.read_line(&mut line);
|
||||||
match resp{
|
match resp {
|
||||||
Ok(len) => {
|
Ok(len) => {
|
||||||
if len > 0{
|
if len > 0 {
|
||||||
self.pos += len as u64;
|
self.pos += len as u64;
|
||||||
self.reader.seek(SeekFrom::Start(self.pos)).unwrap();
|
self.reader.seek(SeekFrom::Start(self.pos)).unwrap();
|
||||||
callback(line.replace("\n", ""));
|
callback(line.replace("\n", ""));
|
||||||
line.clear();
|
line.clear();
|
||||||
}else {
|
} else {
|
||||||
if self.finish{
|
if self.finish {
|
||||||
break;
|
break;
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
self.reopen_if_log_rotated(callback);
|
self.reopen_if_log_rotated(callback);
|
||||||
self.reader.seek(SeekFrom::Start(self.pos)).unwrap();
|
self.reader.seek(SeekFrom::Start(self.pos)).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
println!("{}", err);
|
println!("{}", err);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ use std::process::exit;
|
||||||
extern crate logwatcher;
|
extern crate logwatcher;
|
||||||
use logwatcher::LogWatcher;
|
use logwatcher::LogWatcher;
|
||||||
|
|
||||||
fn main(){
|
fn main() {
|
||||||
let filename = match args().nth(1) {
|
let filename = match args().nth(1) {
|
||||||
Some(x) => x,
|
Some(x) => x,
|
||||||
None => {
|
None => {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue