Skip to content

Commit

Permalink
fix: upgrade to latest deadpool
Browse files Browse the repository at this point in the history
which includes a fix for its incorrect metrics:

bikeshedder/deadpool#92

Closes SYNC-4522
  • Loading branch information
pjenvey committed Nov 21, 2024
1 parent 9b033ed commit a6c3bfd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 30 deletions.
40 changes: 12 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ diesel_logger = "0.1"
cadence = "1.3"
backtrace = "0.3"
chrono = "0.4"
deadpool = "0.12"
env_logger = "0.11"
futures = { version = "0.3", features = ["compat"] }
futures-util = { version = "0.3", features = [
Expand Down
2 changes: 1 addition & 1 deletion syncserver-db-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ edition.workspace = true

[dependencies]
backtrace.workspace = true
deadpool.workspace = true
futures.workspace = true
http.workspace = true
thiserror.workspace = true

diesel = { workspace = true, features = ["mysql", "r2d2"] }
deadpool = { git = "https://github.com/mozilla-services/deadpool", tag = "deadpool-v0.7.0" }
diesel_migrations = { workspace = true, features = ["mysql"] }
syncserver-common = { path = "../syncserver-common" }
2 changes: 1 addition & 1 deletion syncstorage-spanner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ edition.workspace = true
[dependencies]
backtrace.workspace = true
cadence.workspace = true
deadpool.workspace = true
env_logger.workspace = true
futures.workspace = true
http.workspace = true
Expand All @@ -16,7 +17,6 @@ thiserror.workspace = true

async-trait = "0.1.40"
google-cloud-rust-raw = { version = "0.16.1", features = ["spanner"] }
deadpool = { git = "https://github.com/mozilla-services/deadpool", tag = "deadpool-v0.7.0" }
form_urlencoded = "1.2"
# Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause
# syncserver to either fail to either compile, or start. In those cases, try
Expand Down

0 comments on commit a6c3bfd

Please sign in to comment.