Skip to content

Commit 1bf44aa

Browse files
author
Flavio Oliveira
authored
Merge pull request #2 from snake66/nolog-option
Add --nolog option to silence log file.
2 parents 8e9155b + 6d11d84 commit 1bf44aa

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/main.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ struct Client {
3838
nettfiske: Nettfiske,
3939
ws_out: Sender,
4040
thread_out: TSender<Event>,
41+
logging: bool,
4142
}
4243

4344
impl Handler for Client {
4445
fn on_open(&mut self, _: Handshake) -> WS_RESULT<()> {
45-
match self.nettfiske.setup_logger() {
46+
match self.nettfiske.setup_logger(self.logging) {
4647
Err(why) => panic!("{}", why),
4748
Ok(_) => (),
4849
};
@@ -104,7 +105,10 @@ fn main() {
104105
Arg::with_name("quiet")
105106
.help("Be less verbose")
106107
.short("q")
107-
.long("quiet")
108+
.long("quiet"),
109+
Arg::with_name("nolog")
110+
.help("Don't output log file")
111+
.long("nolog")
108112
]).get_matches();
109113

110114
if let Some(file_name) = matches.value_of("input") {
@@ -113,11 +117,13 @@ fn main() {
113117
let url: String = format!("{}", WEBSOCKET_URL);
114118
let (tx, rx) = channel();
115119

120+
let logging_enabled = !matches.is_present("nolog");
116121
let client = thread::spawn(move || {
117122
connect(url, |sender| Client {
118123
nettfiske: Nettfiske::new(config.clone()),
119124
ws_out: sender,
120125
thread_out: tx.clone(),
126+
logging: logging_enabled,
121127
}).unwrap();
122128
});
123129

src/nettfiske.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ impl Nettfiske {
2323
}
2424
}
2525

26-
pub fn setup_logger(&self) -> Result<(), fern::InitError> {
26+
pub fn setup_logger(&self, enable: bool) -> Result<(), fern::InitError> {
27+
if !enable {
28+
return Ok(());
29+
}
30+
2731
fern::Dispatch::new()
2832
.format(|out, message, _record| {
2933
out.finish(format_args!(

0 commit comments

Comments
 (0)