diff options
| -rw-r--r-- | configserver/src/main/sh/start-logd | 2 | ||||
| -rwxr-xr-x | dist/post_install.sh | 3 | ||||
| -rw-r--r-- | logd/src/apps/logd/.gitignore | 2 | ||||
| -rw-r--r-- | logd/src/apps/logd/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | logd/src/tests/rotate/rotate_test.sh | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 3ad735d5183..ab5f0384678 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -68,5 +68,5 @@ if [ "$multitenant" = "true" ]; then PIDFILE_LOGD=var/run/logd.pid VESPA_SERVICE_NAME=logd export VESPA_SERVICE_NAME - vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${ROOT}/sbin/logd + vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${ROOT}/sbin/vespa-logd fi diff --git a/dist/post_install.sh b/dist/post_install.sh index 897f19a592e..40765357457 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -117,6 +117,9 @@ ln -s vespa-logctl $INSTALLPATH/bin/logctl ln -s vespa-logfmt $INSTALLPATH/bin/logfmt ln -s vespa-log-replay $INSTALLPATH/bin/vlogreplay +# Temporary when renaming binaries in logd +ln -s vespa-logd $INSTALLPATH/sbin/logd + # Temporary when renaming binaries in memfilepersistence ln -s vespa-dump-slotfile $INSTALLPATH/bin/dumpslotfile ln -s vespa-vds-disktool-bin $INSTALLPATH/bin/vdsdisktool-bin diff --git a/logd/src/apps/logd/.gitignore b/logd/src/apps/logd/.gitignore index cad0e581304..a9a724ce05c 100644 --- a/logd/src/apps/logd/.gitignore +++ b/logd/src/apps/logd/.gitignore @@ -1,3 +1,3 @@ /.depend /Makefile -/logd +/vespa-logd diff --git a/logd/src/apps/logd/CMakeLists.txt b/logd/src/apps/logd/CMakeLists.txt index 7caf8300617..24b39c45144 100644 --- a/logd/src/apps/logd/CMakeLists.txt +++ b/logd/src/apps/logd/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(logd_app SOURCES main.cpp - OUTPUT_NAME logd + OUTPUT_NAME vespa-logd INSTALL sbin DEPENDS logd diff --git a/logd/src/tests/rotate/rotate_test.sh b/logd/src/tests/rotate/rotate_test.sh index 2af4d92e078..053a6a3670c 100755 --- a/logd/src/tests/rotate/rotate_test.sh +++ b/logd/src/tests/rotate/rotate_test.sh @@ -18,7 +18,7 @@ sleep 5 $SOURCE_DIRECTORY/create_configfile.sh export VESPA_CONFIG_ID=file:logd.cfg -../../apps/logd/logd & +../../apps/logd/vespa-logd & echo $! > logd.pid ./logd_dummylogger_app |