feat: change log file format
This commit is contained in:
parent
f095d1bf84
commit
bf5680da61
1
src-tauri/Cargo.lock
generated
1
src-tauri/Cargo.lock
generated
@ -42,6 +42,7 @@ checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
|
|||||||
name = "app"
|
name = "app"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
"dirs 4.0.0",
|
"dirs 4.0.0",
|
||||||
"log",
|
"log",
|
||||||
"log4rs",
|
"log4rs",
|
||||||
|
@ -14,6 +14,7 @@ tauri-build = { version = "1.0.0-beta.4" }
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
dirs = "4.0.0"
|
dirs = "4.0.0"
|
||||||
|
chrono = "0.4.19"
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde_yaml = "0.8"
|
serde_yaml = "0.8"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
@ -1,32 +1,30 @@
|
|||||||
extern crate serde_yaml;
|
extern crate serde_yaml;
|
||||||
|
|
||||||
|
use chrono::Local;
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
use log4rs::append::console::ConsoleAppender;
|
use log4rs::append::console::ConsoleAppender;
|
||||||
use log4rs::append::file::FileAppender;
|
use log4rs::append::file::FileAppender;
|
||||||
use log4rs::config::{Appender, Config, Root};
|
use log4rs::config::{Appender, Config, Root};
|
||||||
use log4rs::encode::pattern::PatternEncoder;
|
use log4rs::encode::pattern::PatternEncoder;
|
||||||
use std::fs;
|
use std::fs::{self, File};
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
|
||||||
use tauri::PackageInfo;
|
use tauri::PackageInfo;
|
||||||
|
|
||||||
use crate::utils::{app_home_dir, app_resources_dir};
|
use crate::utils::{app_home_dir, app_resources_dir};
|
||||||
|
|
||||||
/// initialize this instance's log file
|
/// initialize this instance's log file
|
||||||
fn init_log(log_dir: &PathBuf) {
|
fn init_log(log_dir: &PathBuf) {
|
||||||
let log_time = SystemTime::now()
|
let local_time = Local::now().format("%Y-%m-%d_%H:%M:%S").to_string();
|
||||||
.duration_since(UNIX_EPOCH)
|
let log_file = format!("{}.log", local_time);
|
||||||
.unwrap()
|
|
||||||
.as_secs();
|
|
||||||
let log_file = format!("log-{:?}", log_time);
|
|
||||||
let log_file = log_dir.join(log_file);
|
let log_file = log_dir.join(log_file);
|
||||||
|
|
||||||
let stdout = ConsoleAppender::builder().build();
|
let time_format = "{d(%Y-%m-%d %H:%M:%S)} - {m}{n}";
|
||||||
|
let stdout = ConsoleAppender::builder()
|
||||||
|
.encoder(Box::new(PatternEncoder::new(time_format)))
|
||||||
|
.build();
|
||||||
let tofile = FileAppender::builder()
|
let tofile = FileAppender::builder()
|
||||||
.encoder(Box::new(PatternEncoder::new(
|
.encoder(Box::new(PatternEncoder::new(time_format)))
|
||||||
"{d(%Y-%m-%d %H:%M:%S)} - {m}{n}",
|
|
||||||
)))
|
|
||||||
.build(log_file)
|
.build(log_file)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
@ -62,11 +60,13 @@ fn init_config_file(app_dir: &PathBuf, res_dir: &PathBuf) {
|
|||||||
fs::copy(clash_tmpl, clash_path).unwrap();
|
fs::copy(clash_tmpl, clash_path).unwrap();
|
||||||
} else {
|
} else {
|
||||||
// make sure that the config.yaml not null
|
// make sure that the config.yaml not null
|
||||||
let content = "mixed-port: 7890\nallow-lan: false\n".as_bytes();
|
let content = b"\
|
||||||
fs::File::create(clash_path)
|
mixed-port: 7890\n\
|
||||||
.unwrap()
|
log-level: info\n\
|
||||||
.write(content)
|
allow-lan: false\n\
|
||||||
.unwrap();
|
external-controller: 127.0.0.1:9090\n\
|
||||||
|
secret: \"\"\n";
|
||||||
|
File::create(clash_path).unwrap().write(content).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user