snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-01-18 17:11:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix incompatible deps

Browse Source
This commit is contained in:
mpostma 2021-01-04 17:38:09 +01:00
parent 48eb78b14d
commit 83ea088bf7
No known key found for this signature in database
GPG Key ID: CBC8A7C1D7A28C3A
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Cargo.lock generated
View File

@ -12,7 +12,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project 0.4.27", "pin-project 0.4.27",
"tokio 0.2.24", "tokio",
"tokio-util", "tokio-util",
] ]
@ -135,7 +135,7 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"smallvec", "smallvec",
"tokio 0.2.24", "tokio",
] ]
[[package]] [[package]]
@ -1171,7 +1171,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 0.2.24", "tokio",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
@ -1326,7 +1326,7 @@ dependencies = [
"itoa", "itoa",
"pin-project 1.0.2", "pin-project 1.0.2",
"socket2", "socket2",
"tokio 0.2.24", "tokio",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1343,7 +1343,7 @@ dependencies = [
"hyper", "hyper",
"log", "log",
"rustls 0.18.1", "rustls 0.18.1",
"tokio 0.2.24", "tokio",
"tokio-rustls", "tokio-rustls",
"webpki", "webpki",
] ]
@ -1671,7 +1671,7 @@ dependencies = [
"once_cell", "once_cell",
"rand 0.8.1", "rand 0.8.1",
"regex", "regex",
"rustls 0.19.0", "rustls 0.18.1",
"sentry", "sentry",
"serde", "serde",
"serde_json", "serde_json",
@ -1684,7 +1684,7 @@ dependencies = [
"tar", "tar",
"tempdir", "tempdir",
"tempfile", "tempfile",
"tokio 1.0.1", "tokio",
"ureq", "ureq",
"vergen", "vergen",
"walkdir", "walkdir",
@ -2348,7 +2348,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio 0.2.24", "tokio",
"tokio-rustls", "tokio-rustls",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
@ -3019,25 +3019,15 @@ dependencies = [
"pin-project-lite 0.1.11", "pin-project-lite 0.1.11",
"signal-hook-registry", "signal-hook-registry",
"slab", "slab",
"tokio-macros",
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "tokio"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd"
dependencies = [
"autocfg",
"pin-project-lite 0.2.0",
"tokio-macros",
]
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "1.0.0" version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3052,7 +3042,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"rustls 0.18.1", "rustls 0.18.1",
"tokio 0.2.24", "tokio",
"webpki", "webpki",
] ]
@ -3067,7 +3057,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project-lite 0.1.11", "pin-project-lite 0.1.11",
"tokio 0.2.24", "tokio",
] ]
[[package]] [[package]]
@ -3123,7 +3113,7 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.24", "tokio",
"url", "url",
] ]
@ -3143,7 +3133,7 @@ dependencies = [
"resolv-conf", "resolv-conf",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.24", "tokio",
"trust-dns-proto", "trust-dns-proto",
] ]

6
meilisearch-http/Cargo.toml
View File

@ -40,7 +40,7 @@ mime = "0.3.16"
once_cell = "1.5.2" once_cell = "1.5.2"
rand = "0.8.1" rand = "0.8.1"
regex = "1.4.2" regex = "1.4.2"
rustls = "0.19.0" rustls = "0.18.0"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.118", features = ["derive"] }
serde_json = { version = "1.0.61", features = ["preserve_order"] } serde_json = { version = "1.0.61", features = ["preserve_order"] }
serde_qs = "0.8.2" serde_qs = "0.8.2"
@ -50,7 +50,7 @@ slice-group-by = "0.2.6"
structopt = "0.3.21" structopt = "0.3.21"
tar = "0.4.30" tar = "0.4.30"
tempfile = "3.1.0" tempfile = "3.1.0"
tokio = { version = "1.0.1", features = ["macros"] } tokio = { version = "0.2", features = ["macros"] }
ureq = { version = "2.0.0", features = ["tls"], default-features = false } ureq = { version = "2.0.0", features = ["tls"], default-features = false }
walkdir = "2.3.1" walkdir = "2.3.1"
whoami = "1.0.3" whoami = "1.0.3"
@ -73,7 +73,7 @@ optional = true
[dev-dependencies] [dev-dependencies]
serde_url_params = "0.2.0" serde_url_params = "0.2.0"
tempdir = "0.3.7" tempdir = "0.3.7"
tokio = { version = "1.0.1", features = ["macros", "time"] } tokio = { version = "0.2", features = ["macros", "time"] }
[dev-dependencies.assert-json-diff] [dev-dependencies.assert-json-diff]
git = "https://github.com/qdequele/assert-json-diff" git = "https://github.com/qdequele/assert-json-diff"

11
meilisearch-http/src/analytics.rs
View File

@ -127,9 +127,14 @@ pub fn analytics_sender(data: Data, opt: Opt) {
let body = qs::to_string(&request).unwrap(); let body = qs::to_string(&request).unwrap();
let response = ureq::post("https://api.amplitude.com/httpapi").send_string(&body); let response = ureq::post("https://api.amplitude.com/httpapi").send_string(&body);
if !response.ok() { match response {
let body = response.into_string().unwrap(); Err(ureq::Error::Status(_ , response)) => {
error!("Unsuccessful call to Amplitude: {}", body); error!("Unsuccessful call to Amplitude: {}", response.into_string().unwrap_or_default());
}
Err(e) => {
error!("Unsuccessful call to Amplitude: {}", e);
}
_ => (),
} }
thread::sleep(Duration::from_secs(3600)) // one hour thread::sleep(Duration::from_secs(3600)) // one hour