From 68efba18e8eee02fbb6f61f4276ddc0f79d309f7 Mon Sep 17 00:00:00 2001
From: Kaveh Vahedipour <kaveh@arangodb.com>
Date: Wed, 26 Apr 2017 15:32:26 +0200
Subject: [PATCH] keep agencyPrefix, when non set

---
 arangod/Agency/AgencyFeature.cpp | 10 ++++++----
 arangod/Agency/Supervision.cpp   |  2 +-
 arangod/Agency/Supervision.h     |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/arangod/Agency/AgencyFeature.cpp b/arangod/Agency/AgencyFeature.cpp
index c9efd0dba6..2c885e44f2 100644
--- a/arangod/Agency/AgencyFeature.cpp
+++ b/arangod/Agency/AgencyFeature.cpp
@@ -210,11 +210,13 @@ void AgencyFeature::start() {
 
   // Find the agency prefix:
   auto feature = ApplicationServer::getFeature<ClusterFeature>("Cluster");
-  arangodb::consensus::Supervision::setAgencyPrefix(
+  if (!feature->agencyPrefix().empty()) {
+    arangodb::consensus::Supervision::setAgencyPrefix(
       std::string("/") + feature->agencyPrefix());
-  arangodb::consensus::Job::agencyPrefix
-    = std::string("/") + feature->agencyPrefix();
-
+    arangodb::consensus::Job::agencyPrefix
+      = std::string("/") + feature->agencyPrefix();
+  }
+  
   // TODO: Port this to new options handling
   std::string endpoint;
 
diff --git a/arangod/Agency/Supervision.cpp b/arangod/Agency/Supervision.cpp
index ba4daf322b..3d2deb6340 100644
--- a/arangod/Agency/Supervision.cpp
+++ b/arangod/Agency/Supervision.cpp
@@ -566,7 +566,7 @@ std::string Supervision::serverHealth(std::string const& serverName) {
     return status;
   } catch (...) {
     LOG_TOPIC(WARN, Logger::SUPERVISION)
-        << "Couldn't read server health status for server " << serverName;
+      << "Couldn't read server health status for server " << serverName;
     return "";
   }
 }
diff --git a/arangod/Agency/Supervision.h b/arangod/Agency/Supervision.h
index fa7737e22b..9793a1ccdb 100644
--- a/arangod/Agency/Supervision.h
+++ b/arangod/Agency/Supervision.h
@@ -119,7 +119,9 @@ class Supervision : public arangodb::Thread {
   }
 
   static void setAgencyPrefix(std::string prefix) {
+    LOG_TOPIC(WARN, Logger::SUPERVISION) << "WTF? " << _agencyPrefix;
     _agencyPrefix = prefix;
+    LOG_TOPIC(WARN, Logger::SUPERVISION) << "WTF? " << _agencyPrefix;
   }
 
  private: