Skip to content

Commit acf9593

Browse files
authored
RRP-485: Fix worker authentication (#23)
Co-authored-by: Oleg Akulov <o.akulov@nomium.org>
1 parent 8303654 commit acf9593

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

roles/pool/src/main.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use dotenvy::dotenv;
99
use tracing::Level;
1010
use std::str::FromStr;
1111
use std::env;
12+
use tokio::{signal, select};
1213

1314
mod args {
1415
use std::path::PathBuf;
@@ -167,16 +168,9 @@ tracing_subscriber::registry()
167168

168169
let pool = PoolSv2::new(config);
169170

170-
use tokio::signal::unix::{signal, SignalKind};
171-
let mut sigterm = signal(SignalKind::terminate()).unwrap();
172-
let mut sigint = signal(SignalKind::interrupt()).unwrap();
173-
174-
tokio::select! {
175-
_ = sigterm.recv() => {
176-
error!("Received SIGTERM signal, starting graceful shutdown");
177-
}
178-
_ = sigint.recv() => {
179-
error!("Received SIGINT signal, starting graceful shutdown");
171+
select! {
172+
_ = signal::ctrl_c() => {
173+
error!("Received Ctrl+C signal, starting graceful shutdown");
180174
}
181175
result = pool.start() => {
182176
if let Err(e) = result {

roles/translator/src/lib/downstream_sv1/downstream.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,11 @@ impl IsServer<'static> for Downstream {
587587

588588
let result = client
589589
.post(&api_url)
590-
.header("accept", "text/plain")
591590
.header("X-Api-Key", api_key)
592591
.header("Content-Type", "application/json")
593592
.json(&serde_json::json!({
594593
"accountName": worker_name.split('.').next().unwrap_or("").to_string(),
595-
"workerNumber": worker_name.split('.').nth(1).unwrap_or("").to_string()
594+
"workerName": worker_name.split('.').nth(1).unwrap_or("").to_string()
596595
}))
597596
.send()
598597
.await;

0 commit comments

Comments
 (0)