From eb6ff6d96ef6e4dbbababe5fc8a86e473f21ecfd Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahoo-inc.com>
Date: Wed, 6 Jul 2016 13:21:26 +0200
Subject: add API for configserver RPC port

---
 defaults/src/apps/printdefault/printdefault.cpp | 5 +++--
 defaults/src/vespa/defaults.cpp                 | 6 ++++++
 defaults/src/vespa/defaults.h                   | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'defaults/src')

diff --git a/defaults/src/apps/printdefault/printdefault.cpp b/defaults/src/apps/printdefault/printdefault.cpp
index 05840d823be..0419ca9b2dd 100644
--- a/defaults/src/apps/printdefault/printdefault.cpp
+++ b/defaults/src/apps/printdefault/printdefault.cpp
@@ -12,10 +12,10 @@ int main(int argc, char **argv) {
     }
     if (strcmp(argv[1], "home") == 0) {
         printf("%s\n", vespa::Defaults::vespaHome());
-        return 0;
     } else if (strcmp(argv[1], "portbase") == 0) {
         printf("%d\n", vespa::Defaults::vespaPortBase());
-        return 0;
+    } else if (strcmp(argv[1], "configserver_rpc_port") == 0) {
+        printf("%d\n", vespa::Defaults::vespaConfigServerRpcPort());
     } else if (strcmp(argv[1], "configservers") == 0) {
         for (std::string v : vespa::Defaults::vespaConfigServerHosts()) {
             printf("%s\n", v.c_str());
@@ -45,4 +45,5 @@ int main(int argc, char **argv) {
         fprintf(stderr, "Unknown variable '%s'\n", argv[1]);
         return 1;
     }
+    return 0;
 }
diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp
index 653a853d8b1..5c2547b730e 100644
--- a/defaults/src/vespa/defaults.cpp
+++ b/defaults/src/vespa/defaults.cpp
@@ -195,6 +195,12 @@ Defaults::vespaConfigServerHosts()
     return ret;
 }
 
+int
+Defaults::vespaConfigServerRpcPort()
+{
+    return defaultPortConfigServerRpc;
+}
+
 std::vector<std::string>
 Defaults::vespaConfigServerRpcAddrs()
 {
diff --git a/defaults/src/vespa/defaults.h b/defaults/src/vespa/defaults.h
index 0a3da9e294e..ec3f78e1e29 100644
--- a/defaults/src/vespa/defaults.h
+++ b/defaults/src/vespa/defaults.h
@@ -47,6 +47,13 @@ public:
      **/
     static std::vector<std::string> vespaConfigServerHosts();
 
+    /**
+     * Find the RPC port for talking to configservers
+     *
+     * @return the RPC port number
+     **/
+    static int vespaConfigServerRpcPort();
+
     /**
      * Find the RPC addresses to configservers that are configured
      * @return a list of RPC specs in the format tcp/{hostname}:{portnumber}
-- 
cgit v1.2.3