From 63d51b9ae4fabfd2c562ed344d25ffe2ce82145d Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Wed, 26 Apr 2017 10:03:20 +0200
Subject: [PATCH] Port 3.1 fixes to devel, support setting the agencyPrefix
 again.

---
 arangod/Agency/AgencyFeature.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arangod/Agency/AgencyFeature.cpp b/arangod/Agency/AgencyFeature.cpp
index 2ce3df3402..c9efd0dba6 100644
--- a/arangod/Agency/AgencyFeature.cpp
+++ b/arangod/Agency/AgencyFeature.cpp
@@ -208,6 +208,13 @@ void AgencyFeature::start() {
     return;
   }
 
+  // Find the agency prefix:
+  auto feature = ApplicationServer::getFeature<ClusterFeature>("Cluster");
+  arangodb::consensus::Supervision::setAgencyPrefix(
+      std::string("/") + feature->agencyPrefix());
+  arangodb::consensus::Job::agencyPrefix
+    = std::string("/") + feature->agencyPrefix();
+
   // TODO: Port this to new options handling
   std::string endpoint;