diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-06 13:21:26 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-06 13:21:26 +0200 |
commit | eb6ff6d96ef6e4dbbababe5fc8a86e473f21ecfd (patch) | |
tree | 1bb1770b7805093143a8e867c2b970d225bc3014 /defaults | |
parent | 6ca7572b002aa9e743c4fadf941cd67195808b25 (diff) |
add API for configserver RPC port
Diffstat (limited to 'defaults')
-rw-r--r-- | defaults/src/apps/printdefault/printdefault.cpp | 5 | ||||
-rw-r--r-- | defaults/src/vespa/defaults.cpp | 6 | ||||
-rw-r--r-- | defaults/src/vespa/defaults.h | 7 |
3 files changed, 16 insertions, 2 deletions
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 @@ -48,6 +48,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} **/ |