diff options
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs index c9819d0..35e686e 100644 --- a/src/main.rs +++ b/src/main.rs | |||
@@ -1,22 +1,24 @@ | |||
1 | // extern | ||
1 | use anyhow::Result; | 2 | use anyhow::Result; |
2 | use hyper::service::{make_service_fn, service_fn}; | 3 | use hyper::service::{make_service_fn, service_fn}; |
3 | use hyper::Server; | 4 | use hyper::Server; |
4 | use log::trace; | 5 | use log::trace; |
5 | 6 | ||
7 | // internal | ||
6 | mod db; | 8 | mod db; |
7 | use db::init_db; | 9 | use db::{init_db, open_connection}; |
10 | |||
8 | mod service; | 11 | mod service; |
9 | use service::shortner_service; | 12 | use service::shortner_service; |
10 | 13 | ||
11 | use std::sync::{Arc, Mutex}; | ||
12 | |||
13 | fn main() -> Result<()> { | 14 | fn main() -> Result<()> { |
14 | pretty_env_logger::init(); | 15 | pretty_env_logger::init(); |
16 | init_db("./urls.db_3")?; | ||
15 | smol::run(async { | 17 | smol::run(async { |
16 | let addr = ([127, 0, 0, 1], 3000).into(); | 18 | let addr = ([127, 0, 0, 1], 3000).into(); |
17 | let service = make_service_fn(move |_| async { | 19 | let service = make_service_fn(move |_| async { |
18 | Ok::<_, hyper::Error>(service_fn(move |req| { | 20 | Ok::<_, hyper::Error>(service_fn(move |req| { |
19 | let db_conn = init_db("./urls.db_3").unwrap(); | 21 | let db_conn = open_connection("./urls.db_3").unwrap(); |
20 | shortner_service(req, db_conn) | 22 | shortner_service(req, db_conn) |
21 | })) | 23 | })) |
22 | }); | 24 | }); |