diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-05 21:28:15 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-05 21:28:15 +0000 |
| commit | 95afaae2eaabdf33761168c2caeffe77a7970040 (patch) | |
| tree | 6121394a0809df2b81fe56cad27f9ea41ee6360a | |
| parent | 61c0690fc5538257c6729f98e3695fa47a586437 (diff) | |
Use new program names.
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl | 4 | ||||
| -rwxr-xr-x | docker/run/run-vespa-internal.sh | 2 | ||||
| -rwxr-xr-x | node-admin/configserver-app/start-config-server.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl b/config-proxy/src/main/sh/vespa-config-ctl index 4b71805e8d8..c1d4b9613e7 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl +++ b/config-proxy/src/main/sh/vespa-config-ctl @@ -120,7 +120,7 @@ case $1 in fail=true for ((sleepcount=0;$sleepcount<600;sleepcount=$sleepcount+1)) ; do usleep 100000 - if [ -f $P_CONFIG_PROXY ] && kill -0 `cat $P_CONFIG_PROXY` && pingproxy -s `hostname` 2>/dev/null + if [ -f $P_CONFIG_PROXY ] && kill -0 `cat $P_CONFIG_PROXY` && vespa-ping-configproxy -s `hostname` 2>/dev/null then echo "config proxy started (runserver pid `cat $P_CONFIG_PROXY`)" fail=false @@ -130,7 +130,7 @@ case $1 in if $fail ; then echo "Failed to start config proxy!" 1>&2 echo "look for reason in vespa.log, last part follows..." - tail -n 15 $LOGFILE | logfmt - + tail -n 15 $LOGFILE | vespa-logfmt - exit 1 fi diff --git a/docker/run/run-vespa-internal.sh b/docker/run/run-vespa-internal.sh index e8c8c0d4d0e..074c1887394 100755 --- a/docker/run/run-vespa-internal.sh +++ b/docker/run/run-vespa-internal.sh @@ -21,6 +21,6 @@ export VESPA_CONFIG_SERVERS=$(hostname) # Print log forever while true; do - /opt/vespa/bin/logfmt -f /opt/vespa/logs/vespa/vespa.log + /opt/vespa/bin/vespa-logfmt -f /opt/vespa/logs/vespa/vespa.log sleep 10 done diff --git a/node-admin/configserver-app/start-config-server.sh b/node-admin/configserver-app/start-config-server.sh index 448621431f0..f9cf49ed879 100755 --- a/node-admin/configserver-app/start-config-server.sh +++ b/node-admin/configserver-app/start-config-server.sh @@ -101,7 +101,7 @@ function InternalMain { yinst start cloudconfig_server touch $VESPA_HOME/logs/jdisc_core/jdisc_core.log - $VESPA_HOME/bin/logfmt -N -f $VESPA_HOME/logs/jdisc_core/jdisc_core.log + $VESPA_HOME/bin/vespa-logfmt -N -f $VESPA_HOME/logs/jdisc_core/jdisc_core.log } function Main { |