diff options
| -rw-r--r-- | dist/vespa.spec | 3 | ||||
| -rw-r--r-- | vespa-feed-client-cli/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespa-feed-client-cli/src/main/resources/logging.properties | 2 | ||||
| -rwxr-xr-x | vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index de92077fdbd..34afc46c80c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -724,9 +724,12 @@ fi %defattr(-,%{_vespa_user},%{_vespa_group},-) %endif %dir %{_prefix} +%dir %{_prefix}/conf +%dir %{_prefix}/conf/vespa-feed-client %dir %{_prefix}/lib %dir %{_prefix}/lib/jars %{_prefix}/bin/vespa-feed-client +%{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa-feed-client-cli.jar 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 "$@" |