Compare commits
No commits in common. "b51a3fb0f003fb709364c7a5b979b2133f60b035" and "6e86dcbf09d40dfbad5809acae5776f82802f4b0" have entirely different histories.
b51a3fb0f0
...
6e86dcbf09
|
|
@ -4,8 +4,6 @@ version = "0.1.6"
|
|||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.94"
|
||||
clap = { version = "4.5.22", features = ["derive"] }
|
||||
serde = { version = "1.0.215", features = ["derive"] }
|
||||
serde_json = "1.0.133"
|
||||
tokio = { version = "1.42.0", features = ["full", "net"] }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ pub struct Cli {
|
|||
)]
|
||||
command : Commands,
|
||||
}
|
||||
|
||||
#[derive(Debug, Subcommand)]
|
||||
pub enum Commands {
|
||||
#[command(
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
mod cli;
|
||||
mod net;
|
||||
|
||||
use clap::Parser;
|
||||
use cli::Cli;
|
||||
use net::{create_tcp_stream, try_send};
|
||||
use anyhow::Result;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<()>{
|
||||
fn main() -> Result<(), std::io::Error>{
|
||||
let cli = Cli::parse();
|
||||
dbg!(&cli);
|
||||
// println!("{:?}", cli);
|
||||
try_send(create_tcp_stream().await, cli).await?;
|
||||
println!("{:?}", cli);
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
use tokio::net::TcpStream;
|
||||
use tokio::io::AsyncWriteExt;
|
||||
use tokio::time::{Duration, sleep};
|
||||
use anyhow::Result;
|
||||
use super::Cli;
|
||||
|
||||
|
||||
pub async fn create_tcp_stream() -> Result<TcpStream> {
|
||||
let stream = TcpStream::connect("127.0.0.1:7753").await?;
|
||||
Ok(stream)
|
||||
}
|
||||
|
||||
pub async fn try_send(stream: Result<TcpStream>, params: Cli) -> Result<()> {
|
||||
let mut stream = stream?;
|
||||
loop {
|
||||
if stream.writable().await.is_err() {
|
||||
sleep(Duration::from_millis(100)).await;
|
||||
continue;
|
||||
}
|
||||
let msg = format!("{:?}", params);
|
||||
// let msg = r"HTTP/1.1 POST\r\nContent-Length: 14\r\nContent-Type: text/plain\r\n\r\nHello, World!@";
|
||||
stream.write_all(msg.as_bytes()).await?;
|
||||
// ...
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -13,6 +13,8 @@ use std::sync::Arc;
|
|||
use std::time::Duration;
|
||||
use tokio::sync::mpsc;
|
||||
use utils::*;
|
||||
|
||||
#[allow(unused_imports)]
|
||||
use options::preboot::PrebootParams;
|
||||
|
||||
#[tokio::main(flavor = "multi_thread")]
|
||||
|
|
|
|||
|
|
@ -47,14 +47,15 @@ async fn process_connection(mut stream: TcpStream) {
|
|||
let buf_reader = BufReader::new(stream.borrow_mut());
|
||||
let mut rqst = buf_reader.lines();
|
||||
|
||||
|
||||
while let Ok(Some(line)) = rqst.next_line().await {
|
||||
if line.is_empty() {
|
||||
break;
|
||||
}
|
||||
println!("{}", line);
|
||||
}
|
||||
|
||||
// .map(|result| result.unwrap())
|
||||
// .take_while(|line| !line.is_empty())
|
||||
// .collect();
|
||||
let response = "HTTP/1.1 200 OK\r\nContent-Length: 13\r\nContent-Type: text/plain\r\n\r\nHello, World!";
|
||||
stream.write_all(response.as_bytes()).await.unwrap();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ pub async fn subscribe_config_stream(actual_prcs: Arc<Processes>, params: Arc<Pr
|
|||
if params.no_sub || params.no_remote_config {
|
||||
return Err(CustomError::Fatal);
|
||||
}
|
||||
if let Ok(client) = Client::open(format!("redis://{}/", ¶ms.remote_server_url)) {
|
||||
if let Ok(client) = Client::open(format!("redis://{}/", &actual_prcs.config_server)) {
|
||||
if let Ok(mut conn) = client.get_connection() {
|
||||
match crate::utils::get_container_id() {
|
||||
Some(channel_name) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue