diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-22 12:54:54 +0100 |
| commit | 1db80c6ab30aafd0e8c3cc09091f9949e9488145 (patch) | |
| tree | e4534ee6925175563beb5c294976f70755903d02 /configserver/src/main | |
| parent | b1a1038d66df81646bed462295761d1aeed2c1e9 (diff) | |
| parent | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (diff) | |
Merge branch 'master' into hakonhall/define-enable-logserver-flag
Diffstat (limited to 'configserver/src/main')
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 5 | ||||
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index cacbd45ed8e..c3f3e7b6fff 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -14,7 +14,7 @@ <initiallyInRotation>false</initiallyInRotation> </config> - <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" rotationScheme="date" compressOnRotation="true" symlinkName="access.log" /> + <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" compressOnRotation="true" symlinkName="access.log" /> <preprocess:include file='access-logging.xml' required='false' /> <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" /> @@ -57,9 +57,6 @@ <preprocess:include file='hosted-vespa/routing-status.xml' required='false' /> <preprocess:include file='model-integration.xml' required='true' /> - <!-- TODO Vespa 7: Remove scoreboard.xml, replaced by metrics-packets.xml --> - <preprocess:include file='hosted-vespa/scoreboard.xml' required='false' /> - <component id="com.yahoo.vespa.configserver.flags.ConfigServerFlagSource" bundle="configserver-flags"/> <component id="com.yahoo.vespa.configserver.flags.db.FlagsDbImpl" bundle="configserver-flags"/> diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 4248372013e..b3fab139cfe 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -171,6 +171,11 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}/var/crash \ -XX:+ExitOnOutOfMemoryError \ $jvmargs \ + --illegal-access=warn \ + --add-opens=java.base/java.io=ALL-UNNAMED \ + --add-opens=java.base/java.lang=ALL-UNNAMED \ + --add-opens=java.base/java.net=ALL-UNNAMED \ + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ -Djava.library.path=${VESPA_HOME}/lib64 \ -Djava.awt.headless=true \ -Dsun.rmi.dgc.client.gcInterval=3600000 \ |