Skip to content

Commit a2c68ac

Browse files
committed
Refactor main
1 parent 909bc2d commit a2c68ac

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/main.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ use gelf::unpacking::UnPackActor;
1414
fn main() {
1515
let dsn = env::var("SENTRY_DSN")
1616
.unwrap_or_else(|_e| panic!("You must to pass SENTRY_DSN variable from env"));
17-
let udp_addr = env::var("UDP_ADDR").unwrap_or("0.0.0.0:8080".to_owned());
18-
let tcp_addr = env::var("TCP_ADDR").unwrap_or("0.0.0.0:8081".to_owned());
19-
let system_name = env::var("SYSTEM").unwrap_or("Gelf Mover".to_owned());
17+
let udp_addr = env::var("UDP_ADDR").unwrap_or_else(|_| "0.0.0.0:8080".to_string());
18+
let tcp_addr = env::var("TCP_ADDR").unwrap_or_else(|_| "0.0.0.0:8081".to_string());
19+
let system_name = env::var("SYSTEM").unwrap_or_else(|_| "Gelf Mover".to_string());
2020

2121
let reader_threads: usize = env::var("READER_THREADS")
22-
.unwrap_or("1".to_owned())
22+
.unwrap_or_else(|_| "1".to_string())
2323
.parse()
2424
.unwrap();
2525
let unpacker_threads: usize = env::var("UNPACKER_THREADS")
26-
.unwrap_or("1".to_owned())
26+
.unwrap_or_else(|_| "1".to_string())
2727
.parse()
2828
.unwrap();
2929
let max_parallel_chunks: usize = std::env::var("MAX_PARALLEL_CHUNKS")
30-
.unwrap_or("100000".to_owned())
30+
.unwrap_or_else(|_| "100000".to_string())
3131
.parse()
3232
.unwrap();
3333

@@ -37,16 +37,16 @@ fn main() {
3737
let gelf_sentry_processor = SentryProcessorActor::new(&dsn, reader_threads);
3838
let _gelf_printer = GelfPrinterActor::new();
3939
actix::spawn(udp_acceptor::new_udp_acceptor(
40-
udp_addr.to_string(),
40+
udp_addr,
4141
gelf_sentry_processor.clone(),
4242
gelf_reader.clone(),
43-
gelf_unpacker.clone(),
43+
gelf_unpacker,
4444
max_parallel_chunks,
4545
));
4646
actix::spawn(tcp_acceptor::new_tcp_acceptor(
47-
tcp_addr.to_string(),
48-
gelf_sentry_processor.clone(),
49-
gelf_reader.clone(),
47+
tcp_addr,
48+
gelf_sentry_processor,
49+
gelf_reader,
5050
));
5151
system.run().unwrap();
5252
}

0 commit comments

Comments
 (0)