mirrors/zero-to-production
1
0
Fork 0
mirror of https://github.com/LukeMathWalker/zero-to-production.git synced 2025-01-22 06:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to latest tokio.

Browse source
This commit is contained in:
LukeMathWalker 2021-02-11 09:12:55 +00:00
parent ee439df615
commit b1258bd780
4 changed files with 576 additions and 954 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/general.yml vendored
View file

@ -38,7 +38,7 @@ jobs:
- name: Migrate database - name: Migrate database
run: | run: |
sudo apt-get install libpq-dev -y sudo apt-get install libpq-dev -y
cargo install --version=0.2.0 sqlx-cli --no-default-features --features postgres cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
SKIP_DOCKER=true ./scripts/init_db.sh SKIP_DOCKER=true ./scripts/init_db.sh
- uses: actions-rs/cargo@v1 - uses: actions-rs/cargo@v1
with: with:
@ -81,7 +81,7 @@ jobs:
- name: Migrate database - name: Migrate database
run: | run: |
sudo apt-get install libpq-dev -y sudo apt-get install libpq-dev -y
cargo install --version=0.2.0 sqlx-cli --no-default-features --features postgres cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
SKIP_DOCKER=true ./scripts/init_db.sh SKIP_DOCKER=true ./scripts/init_db.sh
- uses: actions-rs/clippy-check@v1 - uses: actions-rs/clippy-check@v1
with: with:
@ -113,7 +113,7 @@ jobs:
- name: Migrate database - name: Migrate database
run: | run: |
sudo apt-get install libpq-dev -y sudo apt-get install libpq-dev -y
cargo install --version=0.2.0 sqlx-cli --no-default-features --features postgres cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
SKIP_DOCKER=true ./scripts/init_db.sh SKIP_DOCKER=true ./scripts/init_db.sh
- name: Run cargo-tarpaulin - name: Run cargo-tarpaulin
uses: actions-rs/tarpaulin@v0.1 uses: actions-rs/tarpaulin@v0.1

1507
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

15
Cargo.toml
View file

@ -13,12 +13,13 @@ path = "src/main.rs"
name = "zero2prod" name = "zero2prod"
[dependencies] [dependencies]
actix-web = "3.0.0" actix-http = "=3.0.0-beta.5"
actix-rt = "1.1.1" actix-service = "=2.0.0-beta.5"
tokio = "0.2.22" actix-web = "=4.0.0-beta.5"
serde = "1.0.115" serde = "1.0.115"
config = { version = "0.10.1", default-features = false, features = ["yaml"] } config = { version = "0.10.1", default-features = false, features = ["yaml"] }
sqlx = { version = "0.4.1", default-features = false, features = [ "runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] } sqlx = { version = "0.5.1", default-features = false, features = [ "runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] }
uuid = { version = "0.8.1", features = ["v4"] } uuid = { version = "0.8.1", features = ["v4"] }
chrono = "0.4.15" chrono = "0.4.15"
tracing = "0.1.19" tracing = "0.1.19"
@ -26,15 +27,17 @@ tracing-futures = "0.2.4"
tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter"] } tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter"] }
tracing-bunyan-formatter = "0.1.6" tracing-bunyan-formatter = "0.1.6"
tracing-log = "0.1.1" tracing-log = "0.1.1"
tracing-actix-web = "0.2.0" tracing-actix-web = "0.3.0-beta.2"
serde-aux = "1.0.1" serde-aux = "1.0.1"
unicode-segmentation = "1.7.1" unicode-segmentation = "1.7.1"
validator = "0.12.0" validator = "0.12.0"
[dev-dependencies] [dev-dependencies]
reqwest = { version = "0.10.7", features = ["json"] } reqwest = { version = "0.11", features = ["json"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
claim = "0.4.0" claim = "0.4.0"
quickcheck = "0.9.2" quickcheck = "0.9.2"
quickcheck_macros = "0.9.1" quickcheck_macros = "0.9.1"
fake = "~2.3.0" fake = "~2.3.0"
actix-rt = "2"
tokio = "1"

2
src/main.rs
View file

@ -4,7 +4,7 @@ use zero2prod::configuration::get_configuration;
use zero2prod::startup::run; use zero2prod::startup::run;
use zero2prod::telemetry::{get_subscriber, init_subscriber}; use zero2prod::telemetry::{get_subscriber, init_subscriber};
#[actix_rt::main] #[actix_web::main]
async fn main() -> std::io::Result<()> { async fn main() -> std::io::Result<()> {
let subscriber = get_subscriber("zero2prod".into(), "info".into()); let subscriber = get_subscriber("zero2prod".into(), "info".into());
init_subscriber(subscriber); init_subscriber(subscriber);