Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec5e59a055c7
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc18d6626ce9
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on May 29, 2020

  1. lapin: 1.0.0-rc6 -> 1.0.0

    @LnL7 @cole-h
    LnL7 authored and cole-h committed May 29, 2020
    Copy the full SHA
    350e285 View commit details

  2. update lapin consumer 

    The Stream implementation for consumers was changed to include the
channel.  Should be the last api change since it's released now.

    impl Stream for Consumer {
        type Item = Result<(Channel, Delivery)>;
    }
    @LnL7 @cole-h
    LnL7 authored and cole-h committed May 29, 2020
    Copy the full SHA
    fc41460 View commit details

  3. sort dependencies

    @LnL7 @cole-h
    LnL7 authored and cole-h committed May 29, 2020
    Copy the full SHA
    cc18d66 View commit details
Showing with 49 additions and 48 deletions.
  1. +21 −21 Cargo.lock
  2. +12 −12 Cargo.nix
  3. +12 −13 ofborg/Cargo.toml
  4. +4 −2 ofborg/src/easylapin.rs
42 changes: 21 additions & 21 deletions Cargo.lock
View file

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

24 changes: 12 additions & 12 deletions Cargo.nix
View file
Original file line number Diff line number Diff line change
@@ -119,9 +119,9 @@ rec {
};
"amq-protocol" = rec {
crateName = "amq-protocol";
version = "6.0.0-rc7";
version = "6.0.0-rc9";
edition = "2018";
sha256 = "06ys8l0qd031z26nprhsqmq6skwals2ylpav3kgkvbk0d5gwy1zi";
sha256 = "06w1vrkdnh654sp5nndjfc9yfac4wdsy7jggkyppj15ypr2jgqaw";
libName = "amq_protocol";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -171,9 +171,9 @@ rec {
};
"amq-protocol-codegen" = rec {
crateName = "amq-protocol-codegen";
version = "6.0.0-rc7";
version = "6.0.0-rc9";
edition = "2018";
sha256 = "0di623y8pcpw15zhkckbca480qg99ih2lsqqjnlgm1b13n4sfl8z";
sha256 = "0h9h08k97hix72n3azpw4xdivdn66ca4vpailhq9wwkqkdzydx7i";
libName = "amq_protocol_codegen";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -201,9 +201,9 @@ rec {
};
"amq-protocol-tcp" = rec {
crateName = "amq-protocol-tcp";
version = "6.0.0-rc7";
version = "6.0.0-rc9";
edition = "2018";
sha256 = "11yq8589vi0kcr1rivc97r9sm75g7jhrb58j7dppgd1875v6225n";
sha256 = "01n2iqs2fgbp8ln9759wcdkpwqzaa861dn734igfrwimv839n52k";
libName = "amq_protocol_tcp";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -237,9 +237,9 @@ rec {
};
"amq-protocol-types" = rec {
crateName = "amq-protocol-types";
version = "6.0.0-rc7";
version = "6.0.0-rc9";
edition = "2018";
sha256 = "15dsxydv32g3j9sf0mfpqi8sa85ma3m5vwv2yi1hq80nd61w1qh0";
sha256 = "0s64hgvp737pkv5j03zy63yfbxb8rlr3p8byxagds78wj5bm0s43";
libName = "amq_protocol_types";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -270,9 +270,9 @@ rec {
};
"amq-protocol-uri" = rec {
crateName = "amq-protocol-uri";
version = "6.0.0-rc7";
version = "6.0.0-rc9";
edition = "2018";
sha256 = "05fj5an4ixfgl7kh4vf55xaa2v6grj6bpxcf4wqx4klff11172bv";
sha256 = "0xn54qdw7iil323gjk84s7lyilc3rn5vd520ic4f6i0yay50q54q";
libName = "amq_protocol_uri";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -1549,9 +1549,9 @@ rec {
};
"lapin" = rec {
crateName = "lapin";
version = "1.0.0-rc6";
version = "1.0.0";
edition = "2018";
sha256 = "1qq5225w13ybivv2rdwzfa02ghdh19ckmjays9zxxjd5n2h1kk3g";
sha256 = "0j1nk3ybq8svccws5hzkfql30livrk1a88xh3fhrv1132zhyii57";
authors = [
"Geoffroy Couprie <geo.couprie@gmail.com>"
"Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"
25 changes: 12 additions & 13 deletions ofborg/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -6,25 +6,24 @@ build = "build.rs"
edition = "2018"

[dependencies]
async-std = "=1.5.0"
chrono = "0.4.6"
either = "1.4.0"
md5 = "0.3.5"
uuid = { version = "0.4", features = ["v4"] }
fs2 = "0.4.2"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
tempfile = "2.2.0"
tracing = "0.1.13"
tracing-subscriber = { version = "0.2.5", features = ["json"] }
hubcaps = { git = "https://github.com/grahamc/hubcaps.git" }
#hubcaps = { path = "../../../grahamc/hubcaps/" } # for testing patches
hyper = "0.10.*"
hyper-native-tls = "0.3.0"
lapin = "1.0.0"
lru-cache = "0.1.1"
md5 = "0.3.5"
nom = "4.0.0-beta3"
sys-info = "0.5.6"
chrono = "0.4.6"
separator = "0.4.1"

async-std = "=1.5.0"
lapin = "1.0.0-rc6"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
sys-info = "0.5.6"
tempfile = "2.2.0"
tracing = "0.1.13"
tracing-subscriber = { version = "0.2.5", features = ["json"] }
uuid = { version = "0.4", features = ["v4"] }
6 changes: 4 additions & 2 deletions ofborg/src/easylapin.rs
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,8 @@ impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for Channel {
FieldTable::default(),
))?;
Ok(Box::pin(async move {
while let Some(Ok(deliver)) = consumer.next().await {
while let Some(Ok(item)) = consumer.next().await {
let (_channel, deliver) = item;
debug!(?deliver.delivery_tag, "consumed delivery");
let content_type = deliver.properties.content_type();
let job = worker
@@ -164,7 +165,8 @@ impl<'a, W: SimpleNotifyWorker + 'a> ConsumerExt<'a, W> for NotifyChannel {
))?;
let mut chan = self.0;
Ok(Box::pin(async move {
while let Some(Ok(deliver)) = consumer.next().await {
while let Some(Ok(item)) = consumer.next().await {
let (_channel, deliver) = item;
debug!(?deliver.delivery_tag, "consumed delivery");
let mut receiver = ChannelNotificationReceiver {
channel: &mut chan,