aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-feed-client-cli
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2021-06-01 09:47:05 +0200
committerGitHub <noreply@github.com>2021-06-01 09:47:05 +0200
commit667afd8e3847ec6839b3164a5a5bc5d119319dbd (patch)
tree2032723b43f86907b95f3cf89e222f5f5124bec1 /vespa-feed-client-cli
parent9370274b0883168d6541ae4c14f45fb922be6848 (diff)
Revert "Revert "Bjorncs/vespa feed client cli""
Diffstat (limited to 'vespa-feed-client-cli')
-rw-r--r--vespa-feed-client-cli/CMakeLists.txt1
-rw-r--r--vespa-feed-client-cli/src/main/resources/logging.properties2
-rwxr-xr-xvespa-feed-client-cli/src/main/sh/vespa-feed-client.sh2
3 files changed, 5 insertions, 0 deletions
diff --git a/vespa-feed-client-cli/CMakeLists.txt b/vespa-feed-client-cli/CMakeLists.txt
index a918981dcd3..4f2f38686d8 100644
--- a/vespa-feed-client-cli/CMakeLists.txt
+++ b/vespa-feed-client-cli/CMakeLists.txt
@@ -2,3 +2,4 @@
install_java_artifact(vespa-feed-client-cli)
vespa_install_script(src/main/sh/vespa-feed-client.sh vespa-feed-client bin)
+configure_file(src/main/resources/logging.properties conf/vespa-feed-client/logging.properties @ONLY)
diff --git a/vespa-feed-client-cli/src/main/resources/logging.properties b/vespa-feed-client-cli/src/main/resources/logging.properties
new file mode 100644
index 00000000000..3f0e8b24e78
--- /dev/null
+++ b/vespa-feed-client-cli/src/main/resources/logging.properties
@@ -0,0 +1,2 @@
+# Disable verbose info logging from org.apache.hc.client5.http.impl.async.AsyncHttpRequestRetryExec
+org.apache.hc.client5.http.impl.async.level = WARNING
diff --git a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
index 2a166dd40bb..ab43fca2f67 100755
--- a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
+++ b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
@@ -79,4 +79,6 @@ exec java \
-Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \
-Djava.awt.headless=true \
-Xms128m -Xmx2048m $(getJavaOptionsIPV46) \
+--add-opens=java.base/sun.security.ssl=ALL-UNNAMED \
+-Djava.util.logging.config.file=${VESPA_HOME}/conf/vespa-feed-client/logging.properties \
-cp ${VESPA_HOME}/lib/jars/vespa-feed-client-cli.jar ai.vespa.feed.client.CliClient "$@"