Skip to content

Commit

Permalink
Merge pull request #97 from golemfactory/staszek/updates-to-gsb-http-…
Browse files Browse the repository at this point in the history
…proxy

update yagna* rev
  • Loading branch information
nieznanysprawiciel authored Apr 18, 2024
2 parents 4ebee97 + 6c27258 commit 4435836
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
26 changes: 16 additions & 10 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ members = [
]

[dependencies]
ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b", features = ["activity", "appkey"] }
ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08", features = ["activity", "appkey"] }
ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }
ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }
ya-service-bus = "0.7.1"
ya-client-model = "0.6.0"
ya-agreement-utils = "0.5"
ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-transfer = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-counters = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-transfer = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }
ya-counters = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }
gpu-detection = { path = "gpu-detection" }

actix = "0.13"
Expand All @@ -41,7 +41,7 @@ flexi_logger = { version = "0.28", features = ["colors"] }
regex = "1"
reqwest = { version = "0.11", features = ["blocking", "json"] }
async-stream = "0.3"
ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }
http = "1.1"
bytes = "1.5"
humantime = "2.1"
Expand All @@ -53,7 +53,7 @@ assert_cmd = "2.0"
predicates = "3.1"

[patch.crates-io]
ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "c16a6baa45f523ecf4dd8f190d5d0db5cd44c14b" }
ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" }

[build-dependencies]
static_vcruntime = "2.0"
6 changes: 1 addition & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use ya_counters::message::GetCounters;
use ya_counters::service::{CountersService, CountersServiceBuilder};
use ya_counters::TimeCounter;
use ya_gsb_http_proxy::gsb_to_http::GsbToHttpProxy;
use ya_gsb_http_proxy::message::GsbHttpCallMessage;
use ya_service_bus::typed::{self as gsb, Endpoint};
use ya_transfer::transfer::{DeployImage, Shutdown, TransferService, TransferServiceContext};

Expand Down Expand Up @@ -466,10 +465,7 @@ async fn run<RUNTIME: process::Runtime + Clone + Unpin + 'static>(
}
});

gsb::bind_stream(&exe_unit_url, move |message: GsbHttpCallMessage| {
let stream = gsb_proxy.pass(message);
Box::pin(stream.map(Ok))
});
gsb_proxy.bind(&exe_unit_url);
};
send_state(
&ctx,
Expand Down

0 comments on commit 4435836

Please sign in to comment.