mirror of
https://github.com/stakwork/sphinx-key.git
synced 2025-12-20 08:44:26 +01:00
debuggin
This commit is contained in:
@@ -101,7 +101,9 @@ async fn run_main(parent_fd: i32) -> rocket::Rocket<rocket::Build> {
|
|||||||
error_log::log_errors(error_rx);
|
error_log::log_errors(error_rx);
|
||||||
|
|
||||||
log::info!("=> start broker on network: {}", settings.network);
|
log::info!("=> start broker on network: {}", settings.network);
|
||||||
start_broker(rx, status_tx, error_tx.clone(), CLIENT_ID, settings).await;
|
start_broker(rx, status_tx, error_tx.clone(), CLIENT_ID, settings)
|
||||||
|
.await
|
||||||
|
.expect("BROKER FAILED TO START");
|
||||||
log::info!("=> wait for connected status");
|
log::info!("=> wait for connected status");
|
||||||
// wait for connection = true
|
// wait for connection = true
|
||||||
let status = status_rx.recv().await.expect("couldnt receive");
|
let status = status_rx.recv().await.expect("couldnt receive");
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use crate::util::Settings;
|
use crate::util::Settings;
|
||||||
use crate::{ChannelReply, ChannelRequest};
|
use crate::{ChannelReply, ChannelRequest};
|
||||||
use rocket::tokio::task;
|
|
||||||
use rocket::tokio::time::timeout;
|
use rocket::tokio::time::timeout;
|
||||||
use rocket::tokio::{self, sync::broadcast, sync::mpsc};
|
use rocket::tokio::{self, sync::broadcast, sync::mpsc};
|
||||||
use rumqttd::{Alert, AlertEvent, Broker, Config, Notification};
|
use rumqttd::{Alert, AlertEvent, Broker, Config, Notification};
|
||||||
@@ -31,7 +30,7 @@ pub async fn start_broker(
|
|||||||
|
|
||||||
// connected/disconnected status alerts
|
// connected/disconnected status alerts
|
||||||
let status_sender_ = status_sender.clone();
|
let status_sender_ = status_sender.clone();
|
||||||
let alerts_handle = tokio::spawn(async move {
|
let _alerts_handle = tokio::spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
let alert = alerts.poll();
|
let alert = alerts.poll();
|
||||||
println!("Alert: {alert:?}");
|
println!("Alert: {alert:?}");
|
||||||
@@ -60,8 +59,9 @@ pub async fn start_broker(
|
|||||||
link_tx.subscribe(topics::VLS_RETURN)?;
|
link_tx.subscribe(topics::VLS_RETURN)?;
|
||||||
link_tx.subscribe(topics::CONTROL_RETURN)?;
|
link_tx.subscribe(topics::CONTROL_RETURN)?;
|
||||||
link_tx.subscribe(topics::ERROR)?;
|
link_tx.subscribe(topics::ERROR)?;
|
||||||
let sub_task = tokio::spawn(async move {
|
let _sub_task = tokio::spawn(async move {
|
||||||
while let Ok(message) = link_rx.recv() {
|
while let Ok(message) = link_rx.recv() {
|
||||||
|
println!("MESG RECEIVED!!!!!! {:?}", message);
|
||||||
if let Some(n) = message {
|
if let Some(n) = message {
|
||||||
match n {
|
match n {
|
||||||
Notification::Forward(f) => {
|
Notification::Forward(f) => {
|
||||||
@@ -76,9 +76,9 @@ pub async fn start_broker(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let relay_task = tokio::spawn(async move {
|
let _relay_task = tokio::spawn(async move {
|
||||||
while let Some(msg) = receiver.recv().await {
|
while let Some(msg) = receiver.recv().await {
|
||||||
link_tx.publish(msg.topic, msg.message);
|
let _ = link_tx.publish(msg.topic, msg.message);
|
||||||
match timeout(Duration::from_millis(REPLY_TIMEOUT_MS), msg_rx.recv()).await {
|
match timeout(Duration::from_millis(REPLY_TIMEOUT_MS), msg_rx.recv()).await {
|
||||||
Ok(reply) => {
|
Ok(reply) => {
|
||||||
if let Err(_) = msg.reply_tx.send(ChannelReply {
|
if let Err(_) = msg.reply_tx.send(ChannelReply {
|
||||||
@@ -95,9 +95,12 @@ pub async fn start_broker(
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
alerts_handle.await?;
|
println!("wait...");
|
||||||
sub_task.await?;
|
tokio::time::sleep(Duration::from_secs(2)).await;
|
||||||
relay_task.await?;
|
println!("done waiting");
|
||||||
|
// alerts_handle.await?;
|
||||||
|
// sub_task.await?;
|
||||||
|
// relay_task.await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ use crate::routes::launch_rocket;
|
|||||||
use crate::util::Settings;
|
use crate::util::Settings;
|
||||||
use crate::ChannelRequest;
|
use crate::ChannelRequest;
|
||||||
use rocket::tokio::{self, sync::broadcast, sync::mpsc};
|
use rocket::tokio::{self, sync::broadcast, sync::mpsc};
|
||||||
|
use sphinx_signer::{parser, sphinx_glyph::topics};
|
||||||
use vls_protocol::serde_bolt::WireString;
|
use vls_protocol::serde_bolt::WireString;
|
||||||
use vls_protocol::{msgs, msgs::Message};
|
use vls_protocol::{msgs, msgs::Message};
|
||||||
use sphinx_signer::{parser, sphinx_glyph::topics};
|
|
||||||
|
|
||||||
const CLIENT_ID: &str = "test-1";
|
const CLIENT_ID: &str = "test-1";
|
||||||
|
|
||||||
@@ -22,7 +22,10 @@ pub async fn run_test() -> rocket::Rocket<rocket::Build> {
|
|||||||
let (error_tx, error_rx) = broadcast::channel(1000);
|
let (error_tx, error_rx) = broadcast::channel(1000);
|
||||||
crate::error_log::log_errors(error_rx);
|
crate::error_log::log_errors(error_rx);
|
||||||
|
|
||||||
start_broker(rx, status_tx, error_tx.clone(), CLIENT_ID, settings).await;
|
start_broker(rx, status_tx, error_tx.clone(), CLIENT_ID, settings)
|
||||||
|
.await
|
||||||
|
.expect("FAILED TO START BROKER");
|
||||||
|
log::info!("BROKER started!");
|
||||||
let mut connected = false;
|
let mut connected = false;
|
||||||
let tx_ = tx.clone();
|
let tx_ = tx.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
|||||||
@@ -83,11 +83,8 @@ pub fn setup_logging(who: &str, level_arg: &str) {
|
|||||||
.level(log::LevelFilter::from_str(&level).expect("level"))
|
.level(log::LevelFilter::from_str(&level).expect("level"))
|
||||||
.level_for("h2", log::LevelFilter::Info)
|
.level_for("h2", log::LevelFilter::Info)
|
||||||
.level_for("sled", log::LevelFilter::Info)
|
.level_for("sled", log::LevelFilter::Info)
|
||||||
.level_for("librumqttd::async_locallink", log::LevelFilter::Error)
|
.level_for("rumqttd", log::LevelFilter::Warn)
|
||||||
.level_for(
|
.level_for("rocket", log::LevelFilter::Warn)
|
||||||
"librumqttd::rumqttlog::router::router",
|
|
||||||
log::LevelFilter::Warn,
|
|
||||||
)
|
|
||||||
.chain(std::io::stdout())
|
.chain(std::io::stdout())
|
||||||
// .chain(fern::log_file("/tmp/output.log")?)
|
// .chain(fern::log_file("/tmp/output.log")?)
|
||||||
.apply()
|
.apply()
|
||||||
|
|||||||
Reference in New Issue
Block a user