From 07f3d265f9199b264f02be519f149bcfbd4b657f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 28 Jan 2018 23:21:51 -0500
Subject: [PATCH] update amqp to avoid self-destruction from heartbeats

---
 nix/ofborg-carnix.nix | 4 ++--
 ofborg/Cargo.lock     | 2 +-
 php/poster.php        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/ofborg-carnix.nix b/nix/ofborg-carnix.nix
index 02488da..0db9a98 100644
--- a/nix/ofborg-carnix.nix
+++ b/nix/ofborg-carnix.nix
@@ -49,8 +49,8 @@ let kernel = buildPlatform.parsed.kernel.name;
       authors = [ "Andrii Dmytrenko <andrey@reevoo.com>" ];
       src = fetchgit {
          url = "https://github.com/grahamc/rust-amqp.git";
-         rev = "be492890a30884be391b2effc0a6dfb3d02f74f6";
-         sha256 = "1why8dw6g73s40n1h8lyv7qkckc06bgn22ny4m2f3lrlvkn9gv02";
+         rev = "f35e2c17de69038c4593621346b4ec6d64cfeaf4";
+         sha256 = "0b4c6alvd4ivv0s73nr8lqkiz27lcgszlkv8nb9alcmpy71x8hqd";
       };
       inherit dependencies buildDependencies features;
     };
diff --git a/ofborg/Cargo.lock b/ofborg/Cargo.lock
index 2a4a914..2c2dd60 100644
--- a/ofborg/Cargo.lock
+++ b/ofborg/Cargo.lock
@@ -30,7 +30,7 @@ dependencies = [
 [[package]]
 name = "amqp"
 version = "0.1.0"
-source = "git+https://github.com/grahamc/rust-amqp.git#be492890a30884be391b2effc0a6dfb3d02f74f6"
+source = "git+https://github.com/grahamc/rust-amqp.git#f35e2c17de69038c4593621346b4ec6d64cfeaf4"
 dependencies = [
  "amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/php/poster.php b/php/poster.php
index 8729a38..b42624c 100644
--- a/php/poster.php
+++ b/php/poster.php
@@ -86,7 +86,7 @@ function outrunner($msg) {
 }
 
 
-$consumerTag = 'consumer' . getmypid();
+$consumerTag = 'poster-' . getmypid();
 $channel->basic_consume($queueName, $consumerTag, false, false, false, false, 'outrunner');
 while(count($channel->callbacks)) {
     $channel->wait();