summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-11-08 08:32:46 +0100
committerHarald Musum <musum@yahooinc.com>2023-11-08 08:32:46 +0100
commitc679b96072f0b85cf28dba8819b03efc89f5c743 (patch)
treebba17d3806d457fbb4a0f340d86a224205b01d06 /config
parent1e8cf6c828048d8ad6d3a0e8c663b9a76db59d19 (diff)
Minor changes to usage output
Diffstat (limited to 'config')
-rw-r--r--config/src/apps/vespa-get-config/getconfig.cpp35
1 files changed, 18 insertions, 17 deletions
diff --git a/config/src/apps/vespa-get-config/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index ebbe57f10aa..1d42c48cf22 100644
--- a/config/src/apps/vespa-get-config/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -53,22 +53,22 @@ int
GetConfig::usage(const char *self)
{
fprintf(stderr, "usage: %s -n name -i configId\n", self);
- fprintf(stderr, "-n name (config name, including namespace, on the form <namespace>.<name>)\n");
- fprintf(stderr, "-i configId (config id, optional)\n");
- fprintf(stderr, "-j (output config as json, optional)\n");
- fprintf(stderr, "-l (output config in legacy cfg format, optional)\n");
- fprintf(stderr, "-g generation (config generation, optional)\n");
- fprintf(stderr, "-a schema (config def schema file, optional)\n");
- fprintf(stderr, "-v defVersion (config definition version, optional, deprecated)\n");
- fprintf(stderr, "-m defMd5 (definition md5sum, optional)\n");
- fprintf(stderr, "-t serverTimeout (server timeout in seconds, default 3)\n");
- fprintf(stderr, "-w timeout (timeout in seconds, default 10)\n");
- fprintf(stderr, "-s server (server hostname, default localhost)\n");
- fprintf(stderr, "-p port (proxy/server port number, default 19090)\n");
- fprintf(stderr, "-r traceLevel (tracelevel to use in request, default 0\n");
- fprintf(stderr, "-V vespaVersion (vespa version to use in request, optional\n");
- fprintf(stderr, "-d (debug mode)\n");
- fprintf(stderr, "-h (This help text)\n");
+ fprintf(stderr, "-n name config name, on the form <namespace>.<name>\n");
+ fprintf(stderr, "-i configId config id, optional\n");
+ fprintf(stderr, "-j output config as json, optional\n");
+ fprintf(stderr, "-l output config in legacy cfg format, optional\n");
+ fprintf(stderr, "-g generation config generation, optional\n");
+ fprintf(stderr, "-a schema config def schema file, optional\n");
+ fprintf(stderr, "-v defVersion config definition version, optional, deprecated\n");
+ fprintf(stderr, "-m defMd5 definition md5sum, optional\n");
+ fprintf(stderr, "-t serverTimeout server timeout in seconds, default 3\n");
+ fprintf(stderr, "-w timeout timeout in seconds, default 10\n");
+ fprintf(stderr, "-s server server hostname, default localhost\n");
+ fprintf(stderr, "-p port proxy/server port number, default 19090\n");
+ fprintf(stderr, "-r traceLevel tracelevel to use in request, default 0\n");
+ fprintf(stderr, "-V vespaVersion vespa version to use in request, optional\n");
+ fprintf(stderr, "-d debug mode\n");
+ fprintf(stderr, "-h This help text\n");
return 1;
}
@@ -106,7 +106,7 @@ GetConfig::main(int argc, char **argv)
std::string defNamespace("config");
const char *serverHost = "localhost";
const char *configId = getenv("VESPA_CONFIG_ID");
- bool printAsJson = false;
+ bool printAsJson = false; // TODO: Change default value in Vespa 9
int traceLevel = config::protocol::readTraceLevel();
const char *vespaVersionString = nullptr;
int64_t generation = 0;
@@ -128,6 +128,7 @@ GetConfig::main(int argc, char **argv)
case 'n':
defName = optarg;
break;
+ // TODO: Remove in Vespa 9
case 'v':
break;
case 'g':