From 87a653acde7c47f651917382aaa4ad385e697053 Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 18 Jan 2024 10:54:46 -0800 Subject: [PATCH 1/3] dynamic port number --- .gitignore | 2 ++ server/.env.example | 1 + server/src/main.rs | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3323b34 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.env +.DS_Store diff --git a/server/.env.example b/server/.env.example index 2e204b8..0cdbc4b 100644 --- a/server/.env.example +++ b/server/.env.example @@ -1,3 +1,4 @@ +PORT=3000 REDIS_URL=redis://localhost:6379 RPC_URL=https://rpc.ankr.com/eth OPENSEA_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/server/src/main.rs b/server/src/main.rs index 42dc2d7..ba4d2a4 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -51,8 +51,13 @@ async fn main() { let shutdown_clone = shutdown_signal.clone(); - let server_future = async { - let http_result = http::setup(state).listen(3000, shutdown_clone).await; + let port: u16 = env::var("PORT") + .unwrap_or_else(|_| "3000".to_string()) + .parse() + .expect("PORT must be a number"); + + let server_future = async move { + let http_result = http::setup(state).listen(port, shutdown_clone).await; if let Err(err) = http_result { error!("HTTP server error: {}", err); From 8830a7ce9f7eb4a897be54802a7e715665f800b8 Mon Sep 17 00:00:00 2001 From: "Antonio F. Trstenjak" Date: Thu, 18 Jan 2024 20:21:22 +0100 Subject: [PATCH 2/3] Remove root .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3323b34..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.env -.DS_Store From 0dbc30a8cc2c090b0776a9c9a3e2e5b88dbacf01 Mon Sep 17 00:00:00 2001 From: "Antonio F. Trstenjak" Date: Thu, 18 Jan 2024 20:30:55 +0100 Subject: [PATCH 3/3] fmt --- server/src/abi/mod.rs | 4 ++-- server/src/main.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/abi/mod.rs b/server/src/abi/mod.rs index 7a864d9..4ecbea7 100644 --- a/server/src/abi/mod.rs +++ b/server/src/abi/mod.rs @@ -2,7 +2,7 @@ #[allow(non_snake_case)] pub mod IResolver { use ethers::prelude::abigen; - + abigen!(Resolver, "./src/abi/resolver.json"); } @@ -10,6 +10,6 @@ pub mod IResolver { #[allow(non_snake_case)] pub mod UResolver { use ethers::prelude::abigen; - + abigen!(UniversalResolver, "./src/abi/universal_resolver.json"); } diff --git a/server/src/main.rs b/server/src/main.rs index ba4d2a4..1b93be5 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -52,9 +52,9 @@ async fn main() { let shutdown_clone = shutdown_signal.clone(); let port: u16 = env::var("PORT") - .unwrap_or_else(|_| "3000".to_string()) - .parse() - .expect("PORT must be a number"); + .unwrap_or_else(|_| "3000".to_string()) + .parse() + .expect("PORT should be a number"); let server_future = async move { let http_result = http::setup(state).listen(port, shutdown_clone).await;