Skip to content

Fix the stream listener loop #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2025
Merged

Fix the stream listener loop #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72dfdfc
Fix the stream listener loop
danimhr Sep 4, 2025
5dbf890
Fix
danimhr Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pythnet-watcher"
version = "1.1.0"
version = "1.1.1"
edition = "2021"

[dependencies]
Expand Down
127 changes: 68 additions & 59 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,69 +156,74 @@ async fn run_listener(input: RunListenerInput) -> anyhow::Result<()> {
)
.await?;

tokio::select! {
update = stream.next() => {
let Some(update) = update else {
tracing::error!("Failed to receive update");
tokio::spawn(async move { unsubscribe().await });
bail!("Stream ended");
};
let started = Instant::now();
let unreliable_data = decode_and_verify_update(&input.wormhole_pid, &input.accumulator_address, update);
let status = if unreliable_data.is_err() {
"error"
} else {
"success"
};
let duration = started.elapsed();
metrics::histogram!("decode_and_verify_observed_messages_duration").record(
duration.as_secs_f64(),
);
metrics::counter!("decode_and_verify_observed_messages", &[("status", status)]).increment(1);
if let Ok(unreliable_data) = unreliable_data {
tokio::spawn({
let (api_clients, signer) = (input.api_clients.clone(), input.signer.clone());
async move {
let started = Instant::now();
let body = message_data_to_body(&unreliable_data);
let status = match Observation::try_new(body.clone(), signer.clone()).await {
Ok(observation) => {
join_all(api_clients.iter().map(|api_client| {
let observation = observation.clone();
let api_client = api_client.clone();
async move {
if let Err(e) = api_client.post_observation(observation).await {
tracing::warn!(url = api_client.get_base_url().to_string(), error = ?e, "Failed to post observation");
} else {
tracing::info!(url = api_client.get_base_url().to_string(), "Observation posted successfully");
let mut exit_receiver = EXIT.subscribe();
// Check if the exit flag is already set, if so, we don't need to wait.
if *exit_receiver.borrow() {
tracing::info!("Received exit signal, stopping pythnet watcher");
return Ok(());
}

loop {
tokio::select! {
update = stream.next() => {
let Some(update) = update else {
tracing::error!("Failed to receive update");
tokio::spawn(async move { unsubscribe().await });
bail!("Stream ended");
};
let started = Instant::now();
let unreliable_data = decode_and_verify_update(&input.wormhole_pid, &input.accumulator_address, update);
let status = if unreliable_data.is_err() {
"error"
} else {
"success"
};
let duration = started.elapsed();
metrics::histogram!("decode_and_verify_observed_messages_duration").record(
duration.as_secs_f64(),
);
metrics::counter!("decode_and_verify_observed_messages", &[("status", status)]).increment(1);
if let Ok(unreliable_data) = unreliable_data {
tokio::spawn({
let (api_clients, signer) = (input.api_clients.clone(), input.signer.clone());
async move {
let started = Instant::now();
let body = message_data_to_body(&unreliable_data);
let status = match Observation::try_new(body.clone(), signer.clone()).await {
Ok(observation) => {
join_all(api_clients.iter().map(|api_client| {
let observation = observation.clone();
let api_client = api_client.clone();
async move {
if let Err(e) = api_client.post_observation(observation).await {
tracing::warn!(url = api_client.get_base_url().to_string(), error = ?e, "Failed to post observation");
} else {
tracing::info!(url = api_client.get_base_url().to_string(), "Observation posted successfully");
}
}
}
})).await;
"success"
}
Err(e) => {
tracing::error!(error = ?e, "Failed to create observation");
"error"
}
};
let duration = started.elapsed();
metrics::histogram!("create_and_post_observation_duration").record(
duration.as_secs_f64(),
);
metrics::counter!("create_and_post_observation", &[("status", status)]).increment(1);
}
});
})).await;
"success"
}
Err(e) => {
tracing::error!(error = ?e, "Failed to create observation");
"error"
}
};
let duration = started.elapsed();
metrics::histogram!("create_and_post_observation_duration").record(
duration.as_secs_f64(),
);
metrics::counter!("create_and_post_observation", &[("status", status)]).increment(1);
}
});
}
}
_ = exit_receiver.changed() => {
tracing::info!("Received exit signal, stopping pythnet watcher");
return Ok(())
}
}
_ = wait_for_exit() => {
tracing::info!("Received exit signal, stopping pythnet watcher");
return Ok(())
}
}

tokio::spawn(async move { unsubscribe().await });

bail!("Stream ended")
}

async fn get_signer(run_options: config::RunOptions) -> anyhow::Result<Arc<dyn Signer>> {
Expand Down Expand Up @@ -293,6 +298,10 @@ where
break;
}
}

if *EXIT.borrow() {
break;
}
}
}

Expand Down
Loading