Skip to content

Commit d3ce486

Browse files
zonyitoozonyitoo
committed
Uses default env-logger format
1 parent be60f12 commit d3ce486

File tree

7 files changed

+11
-78
lines changed

7 files changed

+11
-78
lines changed

‎build/Dockerfile.x86_64-pc-windows-gnu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG SODIUM_VERS="1.0.18"
77
ARG OPENSSL_VERS="1.1.1d"
88

99
RUN apt-get update && \
10-
apt-get install --no-install-recommends -y libclang-dev curl libcurl4-openssl-dev ca-certificates m4 make perl llvm libnghttp2-dev libidn2-dev librtmp-dev libpsl-dev libgssapi-krb5-2 libkrb5-dev libk5crypto3 libldap2-dev
10+
apt-get install --no-install-recommends -y curl
1111

1212
# Build a static copy of openssl
1313
RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERS}.tar.gz && \

‎build/Dockerfile.x86_64-unknown-linux-musl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG SODIUM_VERS="1.0.18"
77
ARG OPENSSL_VERS="1.1.1d"
88

99
RUN apt-get update && \
10-
apt-get install --no-install-recommends -y libclang-dev curl libcurl4-openssl-dev ca-certificates m4 make perl llvm libnghttp2-dev libidn2-dev librtmp-dev libpsl-dev libgssapi-krb5-2 libkrb5-dev libk5crypto3 libldap2-dev
10+
apt-get install --no-install-recommends -y curl
1111

1212
# Build a static copy of openssl
1313
RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERS}.tar.gz && \

‎build/build-release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ function build() {
5858
}
5959

6060
build "x86_64-unknown-linux-musl"
61-
build "x86_64-pc-windows-gnu"
61+
build "x86_64-pc-windows-gnu"

‎src/bin/local.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ fn main() {
7777
.takes_value(true)
7878
.help("Set SIP003 plugin options"),
7979
)
80-
.arg(
81-
Arg::with_name("LOG_WITHOUT_TIME")
82-
.long("log-without-time")
83-
.help("Disable time in log"),
84-
)
8580
.arg(
8681
Arg::with_name("URL")
8782
.long("server-url")
@@ -102,10 +97,8 @@ fn main() {
10297
)
10398
.get_matches();
10499

105-
let without_time = matches.is_present("LOG_WITHOUT_TIME");
106100
let debug_level = matches.occurrences_of("VERBOSE");
107-
108-
logging::init(without_time, debug_level, "sslocal");
101+
logging::init(debug_level, "sslocal");
109102

110103
let mut has_provided_config = false;
111104

‎src/bin/logging/mod.rs‎

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,30 @@
1-
use std::{
2-
env,
3-
io::{self, Write},
4-
};
1+
use std::env;
52

6-
use env_logger::{fmt::Formatter, Builder};
7-
use log::{LevelFilter, Record};
8-
use time::{Date, Time};
3+
use env_logger::Builder;
4+
use log::LevelFilter;
95

10-
pub fn init(without_time: bool, debug_level: u64, bin_name: &str) {
6+
pub fn init(debug_level: u64, bin_name: &str) {
117
let mut log_builder = Builder::new();
12-
log_builder.filter(None, LevelFilter::Info);
8+
log_builder.filter(None, LevelFilter::Info).default_format();
139

1410
match debug_level {
1511
0 => {
1612
// Default filter
17-
log_builder.format(move |fmt, r| log_time(fmt, without_time, r));
1813
}
1914
1 => {
20-
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
2115
log_builder.filter(Some(bin_name), LevelFilter::Debug);
2216
}
2317
2 => {
24-
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
2518
log_builder
2619
.filter(Some(bin_name), LevelFilter::Debug)
2720
.filter(Some("shadowsocks"), LevelFilter::Debug);
2821
}
2922
3 => {
30-
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
3123
log_builder
3224
.filter(Some(bin_name), LevelFilter::Trace)
3325
.filter(Some("shadowsocks"), LevelFilter::Trace);
3426
}
3527
_ => {
36-
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
3728
log_builder.filter(None, LevelFilter::Trace);
3829
}
3930
}
@@ -44,40 +35,3 @@ pub fn init(without_time: bool, debug_level: u64, bin_name: &str) {
4435

4536
log_builder.init();
4637
}
47-
48-
fn log_time(fmt: &mut Formatter, without_time: bool, record: &Record) -> io::Result<()> {
49-
if without_time {
50-
writeln!(fmt, "[{}] {}", record.level(), record.args())
51-
} else {
52-
writeln!(
53-
fmt,
54-
"[{}][{}][{}] {}",
55-
Date::today().format("%Y-%m-%d"),
56-
Time::now().format("%H:%M:%S"),
57-
record.level(),
58-
record.args()
59-
)
60-
}
61-
}
62-
63-
fn log_time_module(fmt: &mut Formatter, without_time: bool, record: &Record) -> io::Result<()> {
64-
if without_time {
65-
writeln!(
66-
fmt,
67-
"[{}] [{}] {}",
68-
record.level(),
69-
record.module_path().unwrap_or("*"),
70-
record.args()
71-
)
72-
} else {
73-
writeln!(
74-
fmt,
75-
"[{}][{}][{}] [{}] {}",
76-
Date::today().format("%Y-%m-%d"),
77-
Time::now().format("%H:%M:%S"),
78-
record.level(),
79-
record.module_path().unwrap_or("*"),
80-
record.args()
81-
)
82-
}
83-
}

‎src/bin/server.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ fn main() {
7272
.takes_value(true)
7373
.help("Set SIP003 plugin options"),
7474
)
75-
.arg(
76-
Arg::with_name("LOG_WITHOUT_TIME")
77-
.long("log-without-time")
78-
.help("Disable time in log"),
79-
)
8075
.arg(
8176
Arg::with_name("NO_DELAY")
8277
.long("no-delay")
@@ -91,10 +86,8 @@ fn main() {
9186
)
9287
.get_matches();
9388

94-
let without_time = matches.is_present("LOG_WITHOUT_TIME");
9589
let debug_level = matches.occurrences_of("VERBOSE");
96-
97-
logging::init(without_time, debug_level, "ssserver");
90+
logging::init(debug_level, "ssserver");
9891

9992
let mut has_provided_config = false;
10093
let mut config = match matches.value_of("CONFIG") {

‎src/bin/tunnel.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ fn main() {
9494
.takes_value(true)
9595
.help("Set SIP003 plugin options"),
9696
)
97-
.arg(
98-
Arg::with_name("LOG_WITHOUT_TIME")
99-
.long("log-without-time")
100-
.help("Disable time in log"),
101-
)
10297
.arg(
10398
Arg::with_name("URL")
10499
.long("server-url")
@@ -113,10 +108,8 @@ fn main() {
113108
)
114109
.get_matches();
115110

116-
let without_time = matches.is_present("LOG_WITHOUT_TIME");
117111
let debug_level = matches.occurrences_of("VERBOSE");
118-
119-
logging::init(without_time, debug_level, "sslocal");
112+
logging::init(debug_level, "sstunnel");
120113

121114
let mut has_provided_config = false;
122115

0 commit comments

Comments
 (0)