tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: cleanup codes

Browse source
This commit is contained in:
Jun Kurihara 2023-07-21 22:07:36 +09:00
commit f6c4032f83
No known key found for this signature in database
GPG key ID: 6D3FEE70E498C15B
10 changed files with 280 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rpxy-bin/src/main.rs
View file

@ -11,9 +11,8 @@ mod constants;
mod error;
mod log;
use crate::{cert_file_reader::CryptoFileSource, config::build_globals, log::*};
use rpxy_lib::{entrypoint, Globals};
use std::sync::Arc;
use crate::{config::build_settings, log::*};
use rpxy_lib::entrypoint;
fn main() {
init_logger();
@ -24,7 +23,7 @@ fn main() {
let runtime = runtime_builder.build().unwrap();
runtime.block_on(async {
let globals: Globals<CryptoFileSource> = match build_globals(runtime.handle().clone()) {
let (proxy_conf, app_conf) = match build_settings() {
Ok(g) => g,
Err(e) => {
error!("Invalid configuration: {}", e);
@ -32,7 +31,9 @@ fn main() {
}
};
entrypoint(Arc::new(globals)).await.unwrap()
entrypoint(proxy_conf, app_conf, runtime.handle().clone())
.await
.unwrap()
});
warn!("rpxy exited!");
}