From 4d36de84f0850f961d90ce710ad9d0f582af9b0e Mon Sep 17 00:00:00 2001 From: Bastian Gruber Date: Wed, 19 Apr 2023 14:17:35 +0200 Subject: [PATCH] Renaming --- problem_01/.dockerignore | 1 - problem_01/.gitignore | 1 - problem_01/Cargo.toml | 7 +++---- problem_01/Dockerfile | 11 ----------- problem_01/fly.toml | 20 -------------------- problem_01/src/main.rs | 39 ++------------------------------------- 6 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 problem_01/.dockerignore delete mode 100644 problem_01/.gitignore delete mode 100644 problem_01/Dockerfile delete mode 100644 problem_01/fly.toml diff --git a/problem_01/.dockerignore b/problem_01/.dockerignore deleted file mode 100644 index b83d222..0000000 --- a/problem_01/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/problem_01/.gitignore b/problem_01/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/problem_01/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/problem_01/Cargo.toml b/problem_01/Cargo.toml index 9f09bc6..799fe54 100644 --- a/problem_01/Cargo.toml +++ b/problem_01/Cargo.toml @@ -1,9 +1,8 @@ [package] -name = "problem_01" +name = "problem_02" version = "0.1.0" edition = "2021" +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + [dependencies] -env_logger = "0.9.0" -log = "0.4.0" -tokio = { version = "1.27.0", features = ["full"] } diff --git a/problem_01/Dockerfile b/problem_01/Dockerfile deleted file mode 100644 index f878950..0000000 --- a/problem_01/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM rust:latest as builder -RUN apt-get update && apt-get -y install ca-certificates cmake musl-tools libssl-dev && rm -rf /var/lib/apt/lists/* -COPY . . -RUN rustup default stable && rustup update -RUN rustup target add x86_64-unknown-linux-musl -ENV PKG_CONFIG_ALLOW_CROSS=1 -RUN cargo build --target x86_64-unknown-linux-musl --release -FROM scratch -COPY --from=builder /target/x86_64-unknown-linux-musl/release/problem_01 . -EXPOSE 8080 -CMD ["/problem_01"] diff --git a/problem_01/fly.toml b/problem_01/fly.toml deleted file mode 100644 index 9823019..0000000 --- a/problem_01/fly.toml +++ /dev/null @@ -1,20 +0,0 @@ -# fly.toml app configuration file generated for restless-bush-123 on 2023-04-19T13:36:26+02:00 -# -# See https://fly.io/docs/reference/configuration/ for information about how to use this file. -# - -app = "restless-bush-123" -primary_region = "ams" - -[experimental] - auto_rollback = true - -[env] - ECHO_PORT = "8080" - -[[services]] - protocol = "tcp" - internal_port = 8080 - - [[services.ports]] - port = 8080 diff --git a/problem_01/src/main.rs b/problem_01/src/main.rs index 3d932e3..e7a11a9 100644 --- a/problem_01/src/main.rs +++ b/problem_01/src/main.rs @@ -1,38 +1,3 @@ -use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use tokio::net::TcpListener; - -#[tokio::main] -async fn main() -> Result<(), Box> { - env_logger::init(); - let listener = TcpListener::bind("0.0.0.0:8080").await?; - log::info!("Start TCP server"); - loop { - let (mut socket, _) = listener.accept().await?; - - tokio::spawn(async move { - let mut buf = [0; 1024]; - - loop { - let n = match socket.read(&mut buf).await { - Ok(n) if n == 0 => { - log::info!("Receiving echo: {}", n); - return; - } - Ok(n) => { - log::info!("Receiving echo: {}", n); - n - } - Err(e) => { - log::error!("failed to read from socket; err = {:?}", e); - return; - } - }; - - if let Err(e) = socket.write_all(&buf[0..n]).await { - log::error!("failed to write to socket; err = {:?}", e); - return; - } - } - }); - } +fn main() { + println!("Hello, world!"); }