Skip to content

Commit

Permalink
Net Mk1 - example using docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
filipgolem committed Jan 2, 2020
1 parent e4487fc commit 914b4e0
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 3 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target
8 changes: 8 additions & 0 deletions core/net/examples/docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Net Mk1 Example

## Test

```
cd core/net/examples/docker
docker-compose up
```
21 changes: 21 additions & 0 deletions core/net/examples/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: "3.0"
services:
hub:
build:
context: ../../../..
dockerfile: core/net/examples/docker/hub.Dockerfile
image: hub
provider-1:
build:
context: ../../../..
dockerfile: core/net/examples/docker/provider-1.Dockerfile
image: provider-1
depends_on:
- hub
provider-2:
build:
context: ../../../..
dockerfile: core/net/examples/docker/provider-2.Dockerfile
image: provider-2
depends_on:
- provider-1
8 changes: 8 additions & 0 deletions core/net/examples/docker/hub.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM rust:1.40

WORKDIR /usr/src/yagna-net
COPY . .

RUN cargo build --examples --bins
EXPOSE 9000
CMD [ "cargo", "run", "--bin", "ya-sb-router", "--", "-l", "0.0.0.0:9000" ]
3 changes: 3 additions & 0 deletions core/net/examples/docker/listen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
cargo run --bin ya-sb-router &
cargo run --example listen
9 changes: 9 additions & 0 deletions core/net/examples/docker/provider-1.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM rust:1.40

WORKDIR /usr/src/yagna-net
COPY . .

RUN cargo build --examples --bins
EXPOSE 9000

CMD ./core/net/examples/docker/listen.sh
9 changes: 9 additions & 0 deletions core/net/examples/docker/provider-2.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM rust:1.40

WORKDIR /usr/src/yagna-net
COPY . .

RUN cargo build --examples --bins
EXPOSE 9000

CMD ./core/net/examples/docker/send_message.sh
3 changes: 3 additions & 0 deletions core/net/examples/docker/send_message.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
cargo run --bin ya-sb-router &
cargo run --example send_message
2 changes: 1 addition & 1 deletion core/net/examples/listen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use futures03::future::TryFutureExt;
fn main() -> std::io::Result<()> {
System::run(|| {
Arbiter::spawn(
ya_net::init_service_future("127.0.0.1:9000", "0x789")
ya_net::init_service_future("hub:9000", "0x789")
.map_err(|e| eprintln!("Error: {}", e))
.compat()
.map(|r| {
Expand Down
2 changes: 1 addition & 1 deletion core/net/examples/send_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use futures03::future::TryFutureExt;
fn main() -> std::io::Result<()> {
System::run(|| {
Arbiter::spawn(
ya_net::init_service_future("127.0.0.1:9000", "0x123")
ya_net::init_service_future("hub:9000", "0x123")
.and_then(|_| {
ya_net::send_message_future("0x123", "0x789/test", "Test".as_bytes().to_vec())
.map_err(|e| {
Expand Down
3 changes: 2 additions & 1 deletion core/net/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use futures03::compat::Future01CompatExt;
use futures03::future::Future as Future03;
use ya_service_bus::connection;
use ya_service_bus::{untyped as bus, Error};
use std::net::ToSocketAddrs;

pub const SERVICE_ID: &str = "/net";

Expand All @@ -15,7 +16,7 @@ pub fn init_service_future(
source_node_id: &str,
) -> impl Future03<Output = Result<(), std::io::Error>> {
let source_node_id_clone = format!("{}/{}", SERVICE_ID, source_node_id);
connection::tcp(&hub_addr.parse().unwrap())
connection::tcp(&hub_addr.to_socket_addrs().unwrap().next().unwrap())
.and_then(move |c| {
let connection_ref = connection::connect_with_handler(
c,
Expand Down

0 comments on commit 914b4e0

Please sign in to comment.