updated some variables
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
fe9a577f61
commit
699d12324b
10
src/ipblc.rs
10
src/ipblc.rs
@ -119,19 +119,23 @@ pub async fn run() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let ctxclone = Arc::clone(&ctxarc);
|
let ctxclone = Arc::clone(&ctxarc);
|
||||||
handle_cfg_reload(ctxclone, &mut last_cfg_reload).await;
|
handle_cfg_reload(&ctxclone, &mut last_cfg_reload).await;
|
||||||
|
drop(ctxclone);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_cfg_reload(ctxclone: Arc<RwLock<Context>>, last_cfg_reload: &mut DateTime<Local>) {
|
async fn handle_cfg_reload(ctxclone: &Arc<RwLock<Context>>, last_cfg_reload: &mut DateTime<Local>) {
|
||||||
let now_cfg_reload = Local::now().trunc_subsecs(0);
|
let now_cfg_reload = Local::now().trunc_subsecs(0);
|
||||||
if (now_cfg_reload - *last_cfg_reload) > Duration::seconds(5) {
|
if (now_cfg_reload - *last_cfg_reload) > Duration::seconds(5) {
|
||||||
let mut ctx = ctxclone.write().await;
|
let mut ctx = ctxclone.write().await;
|
||||||
match ctx.load().await {
|
match ctx.load().await {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
*last_cfg_reload = Local::now().trunc_subsecs(0);
|
*last_cfg_reload = Local::now().trunc_subsecs(0);
|
||||||
|
drop(ctx);
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
println!("error reloading config");
|
||||||
}
|
}
|
||||||
Err(_) => {}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -74,21 +74,21 @@ pub async fn websocketconnect<'a>(
|
|||||||
wscfg: &WebSocketCfg,
|
wscfg: &WebSocketCfg,
|
||||||
hostname: String,
|
hostname: String,
|
||||||
) -> Result<WebSocket<MaybeTlsStream<TcpStream>>, Error> {
|
) -> Result<WebSocket<MaybeTlsStream<TcpStream>>, Error> {
|
||||||
print!("connecting to {} ...", &wscfg.endpoint);
|
print!("connecting to {} ... ", &wscfg.endpoint);
|
||||||
io::stdout().flush().unwrap();
|
io::stdout().flush().unwrap();
|
||||||
let mut socket;
|
let mut socket;
|
||||||
loop {
|
loop {
|
||||||
(socket, _) = match connect(&wscfg.endpoint) {
|
(socket, _) = match connect(&wscfg.endpoint) {
|
||||||
Ok((o, e)) => (o, e),
|
Ok((o, e)) => (o, e),
|
||||||
_ => {
|
_ => {
|
||||||
println!("error connecting, retrying");
|
println!("error connecting to {}, retrying", &wscfg.endpoint);
|
||||||
sleep_s(1).await;
|
sleep_s(1).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
println!("connected");
|
println!("connected to {}", &wscfg.endpoint);
|
||||||
let msg = json!({ "hostname": hostname });
|
let msg = json!({ "hostname": hostname });
|
||||||
socket
|
socket
|
||||||
.write_message(Message::Text(msg.to_string()))
|
.write_message(Message::Text(msg.to_string()))
|
||||||
|
Loading…
Reference in New Issue
Block a user