Github/aralez
1
0
Fork 0
mirror of https://github.com/sadoyan/aralez.git synced 2026-06-11 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup, minor fix

Browse Source
This commit is contained in:
Ara Sadoyan
2026-06-10 11:29:35 +02:00
parent 77dcafbb4e
commit 132cf45dfe
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/structs.rs
View File

@@ -112,6 +112,7 @@ pub struct AppConfig {
pub hc_method: String, pub hc_method: String,
pub upstreams_conf: String, pub upstreams_conf: String,
pub log_level: String, pub log_level: String,
pub pid_file: Option<String>,
pub master_key: Option<String>, pub master_key: Option<String>,
pub config_address: String, pub config_address: String,
pub proxy_address_http: String, pub proxy_address_http: String,

11
src/web/start.rs
View File

@@ -79,7 +79,7 @@ pub fn run() {
let mut to = TcpSocketOptions::default(); let mut to = TcpSocketOptions::default();
to.tcp_keepalive = Some(TcpKeepalive { to.tcp_keepalive = Some(TcpKeepalive {
idle: Duration::from_secs(idle), idle: Duration::from_secs(idle),
interval: Duration::from_secs(cfg.tcp_keepalive_interval.unwrap_or(60)), interval: Duration::from_secs(cfg.tcp_keepalive_interval.unwrap_or(10)),
user_timeout: Default::default(), user_timeout: Default::default(),
count: cfg.tcp_keepalive_count.unwrap_or(5usize), count: cfg.tcp_keepalive_count.unwrap_or(5usize),
}); });
@@ -121,13 +121,6 @@ pub fn run() {
proxy.add_tls_with_settings(&bind_address_tls, tcp_options.clone(), tls_settings); proxy.add_tls_with_settings(&bind_address_tls, tcp_options.clone(), tls_settings);
// if let Some(to) = tcp_options.clone() {
// proxy.add_tls_with_settings(&bind_address_tls, Some(to.clone()), tls_settings);
// } else {
// proxy.add_tls_with_settings(&bind_address_tls, None, tls_settings);
// }
// proxy.add_tls_with_settings(&bind_address_tls, None, tls_settings);
let certs_for_watcher = certificates.clone(); let certs_for_watcher = certificates.clone();
thread::spawn(move || { thread::spawn(move || {
while let Ok(new_configs) = rx.recv() { while let Ok(new_configs) = rx.recv() {
@@ -153,7 +146,7 @@ pub fn run() {
drop_priv(user, group, cfg.proxy_address_http.clone(), cfg.proxy_address_tls.clone()); drop_priv(user, group, cfg.proxy_address_http.clone(), cfg.proxy_address_tls.clone());
} }
let _ = sd_notify::notify(&[NotifyState::Ready]); let _ = sd_notify::notify(&[NotifyState::Ready]);
let _ = fs::write("/tmp/aralez.pid", process::id().to_string()); let _ = fs::write(cfg.pid_file.clone().unwrap_or("/tmp/aralez.pid".to_string()), process::id().to_string());
let mut signals = Signals::new(&[SIGINT, SIGTERM, SIGQUIT]).unwrap(); let mut signals = Signals::new(&[SIGINT, SIGTERM, SIGQUIT]).unwrap();
for sig in signals.forever() { for sig in signals.forever() {