Skip to content

Commit

Permalink
Merge pull request #14 from dfinity/integrate-agent-with-discovery
Browse files Browse the repository at this point in the history
feat: integrate `agent` with discovery service
  • Loading branch information
nikolay-komarevskiy authored Aug 15, 2024
2 parents 210f3c5 + ba5db37 commit 8219493
Show file tree
Hide file tree
Showing 10 changed files with 211 additions and 197 deletions.
122 changes: 64 additions & 58 deletions Cargo.lock

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

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ cloudflare = { git = "https://github.com/cloudflare/cloudflare-rs.git", default-
"rustls-tls",
] }
derive-new = "0.6"
discower_bowndary = { git = "https://github.com/dfinity/ic.git" }
fqdn = "0.3"
futures = "0.3"
futures-util = "0.3"
Expand All @@ -57,9 +56,8 @@ itertools = "0.12"
humantime = "2.1"
hyper = "1.3"
hyper-util = "0.1"
ic-agent = { version = "0.37", features = ["reqwest"] }
ic-agent = { version = "0.37.1", features = ["reqwest"] }
ic-http-gateway = { git = "https://github.com/dfinity/http-gateway" }
ic-transport-types = "0.37"
instant-acme = "0.4"
tikv-jemallocator = "0.5"
tikv-jemalloc-ctl = "0.5"
Expand Down Expand Up @@ -136,3 +134,6 @@ strip = "symbols"
codegen-units = 1
lto = "fat"
panic = "abort"

[patch.crates-io]
ic-agent = { package = "ic-agent", git = "https://github.com/dfinity/agent-rs", branch = "dynamic_route", features = ["reqwest"]}
4 changes: 3 additions & 1 deletion src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,12 @@ pub async fn main(cli: &Cli) -> Result<(), Error> {
custom_domain_providers,
&mut tasks,
http_client.clone(),
reqwest_client,
&registry,
clickhouse.clone(),
vector.clone(),
)?;
)
.await?;
let http_router = Router::new().fallback(routing::redirect_to_https);

// HTTP server metrics
Expand Down
Loading

0 comments on commit 8219493

Please sign in to comment.