diff options
author | Akshay <[email protected]> | 2020-08-23 17:47:50 +0100 |
---|---|---|
committer | Akshay <[email protected]> | 2020-08-23 17:47:50 +0100 |
commit | f9051a919fa9af44a5703f55afc11e91607d68c6 (patch) | |
tree | 17198da7d95a53348cbb06e803553fcf94a99a44 /src/main.rs | |
parent | f6f9c45fd847ea5840e0fa143a7c9973fa475fb5 (diff) |
attempt to use single db connection
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs index 6b48957..c9819d0 100644 --- a/src/main.rs +++ b/src/main.rs | |||
@@ -4,15 +4,22 @@ use hyper::Server; | |||
4 | use log::trace; | 4 | use log::trace; |
5 | 5 | ||
6 | mod db; | 6 | mod db; |
7 | use db::init_db; | ||
7 | mod service; | 8 | mod service; |
8 | use service::shortner_service; | 9 | use service::shortner_service; |
9 | 10 | ||
11 | use std::sync::{Arc, Mutex}; | ||
12 | |||
10 | fn main() -> Result<()> { | 13 | fn main() -> Result<()> { |
11 | pretty_env_logger::init(); | 14 | pretty_env_logger::init(); |
12 | smol::run(async { | 15 | smol::run(async { |
13 | let addr = ([127, 0, 0, 1], 3000).into(); | 16 | let addr = ([127, 0, 0, 1], 3000).into(); |
14 | let service = | 17 | let service = make_service_fn(move |_| async { |
15 | make_service_fn(|_| async { Ok::<_, hyper::Error>(service_fn(shortner_service)) }); | 18 | Ok::<_, hyper::Error>(service_fn(move |req| { |
19 | let db_conn = init_db("./urls.db_3").unwrap(); | ||
20 | shortner_service(req, db_conn) | ||
21 | })) | ||
22 | }); | ||
16 | let server = Server::bind(&addr).serve(service); | 23 | let server = Server::bind(&addr).serve(service); |
17 | trace!("Listening on http://{}", addr); | 24 | trace!("Listening on http://{}", addr); |
18 | server.await.unwrap(); | 25 | server.await.unwrap(); |