searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

Merge #1126

Browse source 
1126: Bumps r=MarinPostma a=MarinPostma

bump various meilisearch dependencies

Co-authored-by: mpostma <postma.marin@protonmail.com>
This commit is contained in:
bors[bot] 2020-12-14 19:03:59 +00:00 • committed by GitHub
commit 861c6fec06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 209 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meilisearch-http/Cargo.toml
View file

@ -17,15 +17,15 @@ path = "src/main.rs"
default = ["sentry"]
[dependencies]
actix-cors = "0.4.1"
actix-cors = "0.5.3"
actix-http = "2"
actix-rt = "1"
actix-service = "1.0.6"
actix-web = { version = "3.1.0", features = ["rustls"] }
bytes = "0.5.4"
actix-web = { version = "3.3.2", features = ["rustls"] }
bytes = "0.6.0"
chrono = { version = "0.4.19", features = ["serde"] }
crossbeam-channel = "0.5.0"
env_logger = "0.7.1"
env_logger = "0.8.2"
flate2 = "1.0.18"
futures = "0.3.7"
http = "0.2.1"
@ -37,13 +37,13 @@ meilisearch-error = { path = "../meilisearch-error", version = "0.17.0" }
meilisearch-schema = { path = "../meilisearch-schema", version = "0.17.0" }
meilisearch-tokenizer = {path = "../meilisearch-tokenizer", version = "0.17.0"}
mime = "0.3.16"
once_cell = "1.4.1"
once_cell = "1.5.2"
rand = "0.7.3"
regex = "1.4.1"
regex = "1.4.2"
rustls = "0.18"
serde = { version = "1.0.117", features = ["derive"] }
serde_json = { version = "1.0.59", features = ["preserve_order"] }
serde_qs = "0.7.0"
serde_qs = "0.8.1"
sha2 = "0.9.1"
siphasher = "0.3.2"
slice-group-by = "0.2.6"
@ -53,7 +53,7 @@ tempfile = "3.1.0"
tokio = { version = "0.2.18", features = ["macros"] }
ureq = { version = "1.5.1", features = ["tls"], default-features = false }
walkdir = "2.3.1"
whoami = "0.9.0"
whoami = "1.0.0"
[dependencies.sentry]
version = "0.18.1"

5
meilisearch-http/src/main.rs
View file

@ -47,7 +47,7 @@ async fn main() -> Result<(), MainError> {
}
}
"development" => {
env_logger::from_env(env_logger::Env::default().default_filter_or("info")).init();
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
}
_ => unreachable!(),
}
@ -84,11 +84,10 @@ async fn main() -> Result<(), MainError> {
let http_server = HttpServer::new(move || {
create_app(&data, enable_frontend)
.wrap(
Cors::new()
Cors::default()
.send_wildcard()
.allowed_headers(vec!["content-type", "x-meili-api-key"])
.max_age(86_400) // 24h
.finish(),
)
.wrap(middleware::Logger::default())
.wrap(middleware::Compress::default())