Skip to content

Commit 8c2e785

Browse files
committed
Bug fixed, logging crate in ssdns
1 parent 4fb20d4 commit 8c2e785

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/bin/ssdns.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ fn main() {
108108
}
109109
1 => {
110110
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
111-
log_builder.filter(Some("sslocal"), LevelFilter::Debug);
111+
log_builder.filter(Some("ssdns"), LevelFilter::Debug);
112112
}
113113
2 => {
114114
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
115-
log_builder.filter(Some("sslocal"), LevelFilter::Debug)
115+
log_builder.filter(Some("ssdns"), LevelFilter::Debug)
116116
.filter(Some("shadowsocks"), LevelFilter::Debug);
117117
}
118118
3 => {
119119
let log_builder = log_builder.format(move |fmt, r| log_time_module(fmt, without_time, r));
120-
log_builder.filter(Some("sslocal"), LevelFilter::Trace)
120+
log_builder.filter(Some("ssdns"), LevelFilter::Trace)
121121
.filter(Some("shadowsocks"), LevelFilter::Trace);
122122
}
123123
_ => {
@@ -135,16 +135,18 @@ fn main() {
135135
let mut has_provided_config = false;
136136

137137
let mut config = match matches.value_of("CONFIG") {
138-
Some(cpath) => match Config::load_from_file(cpath, ConfigType::Local) {
139-
Ok(cfg) => {
140-
has_provided_config = true;
141-
cfg
138+
Some(cpath) => {
139+
match Config::load_from_file(cpath, ConfigType::Local) {
140+
Ok(cfg) => {
141+
has_provided_config = true;
142+
cfg
143+
}
144+
Err(err) => {
145+
error!("{:?}", err);
146+
return;
147+
}
142148
}
143-
Err(err) => {
144-
error!("{:?}", err);
145-
return;
146-
}
147-
},
149+
}
148150
None => Config::new(),
149151
};
150152

0 commit comments

Comments
 (0)