diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-11-11 07:05:29 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-11-15 07:05:29 +0100 |
| commit | 869d4de27185e84988617188882e555efdb81531 (patch) | |
| tree | 03f43e30bfc897edd405e024c1c18d102f8ae6f2 | |
| parent | ce567ae5b75b0620da9b6f0460685ae732073a1e (diff) | |
Improved `make daemon` / `daemon.sh` to accept nDPId / nDPIsrvd arguments via env.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/daemon.sh | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 172b0ffb7..b5584274e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ add_custom_command( add_custom_target(daemon) add_custom_command( TARGET daemon - COMMAND "${CMAKE_SOURCE_DIR}/scripts/daemon.sh" "$<TARGET_FILE:nDPId>" "$<TARGET_FILE:nDPIsrvd>" + COMMAND env nDPIsrvd_ARGS='-C 1024' "${CMAKE_SOURCE_DIR}/scripts/daemon.sh" "$<TARGET_FILE:nDPId>" "$<TARGET_FILE:nDPIsrvd>" DEPENDS nDPId nDPIsrvd ) diff --git a/scripts/daemon.sh b/scripts/daemon.sh index a906253cd..74e9ffde0 100755 --- a/scripts/daemon.sh +++ b/scripts/daemon.sh @@ -7,11 +7,15 @@ NROOT="${NROOT:-/tmp}" NUSER="${NUSER:-$(id -u -n)}" NSUFFIX="${NSUFFIX:-daemon-test}" nDPId_THREADS="${nDPId_THREADS:-4}" +nDPId_ARGS="${nDPId_ARGS:-}" +nDPIsrvd_ARGS="${nDPIsrvd_ARGS:-}" if [ x"${1}" = x -o x"${2}" = x ]; then printf '%s\n' "usage: ${0} [nDPId-path] [nDPIsrvd-path]" >&2 - printf '\n\t%s=%s\n' 'env NUSER' "${NUSER}" >&2 - printf '\t%s=%s\n' 'env NSUFFIX' "${NSUFFIX}" >&2 + printf '\n\t%s=%s\n' 'env NUSER' "${NUSER}" >&2 + printf '\t%s=%s\n' 'env NSUFFIX' "${NSUFFIX}" >&2 + printf '\t%s=%s\n' 'env nDPId_ARGS' "${nDPId_ARGS}" >&2 + printf '\t%s=%s\n' 'env nDPIsrvd_ARGS' "${nDPIsrvd_ARGS}" >&2 exit 1 fi @@ -42,7 +46,7 @@ if [ -r "${NROOT}/nDPId-${NSUFFIX}.pid" -o -r "${NROOT}/nDPIsrvd-${NSUFFIX}.pid" printf '%s\n' "daemons stopped" >&2 else set -x - ${2} -p "${NROOT}/nDPIsrvd-${NSUFFIX}.pid" -c "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" -s "${NROOT}/nDPIsrvd-${NSUFFIX}-distributor.sock" -d -L "${NROOT}/nDPIsrvd.log" + sudo ${2} -p "${NROOT}/nDPIsrvd-${NSUFFIX}.pid" -c "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" -s "${NROOT}/nDPIsrvd-${NSUFFIX}-distributor.sock" -d -u "${NUSER}" -L "${NROOT}/nDPIsrvd.log" ${nDPIsrvd_ARGS} test $? -eq 0 || RETVAL=1 MAX_TRIES=10 @@ -63,7 +67,7 @@ else test $? -eq 0 || RETVAL=1 sudo chmod g+w "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" test $? -eq 0 || RETVAL=1 - sudo ${1} -p "${NROOT}/nDPId-${NSUFFIX}.pid" -c "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" -d -u "${NUSER}" -L "${NROOT}/nDPId.log" -o max-reader-threads=${nDPId_THREADS} + sudo ${1} -p "${NROOT}/nDPId-${NSUFFIX}.pid" -c "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" -d -u "${NUSER}" -L "${NROOT}/nDPId.log" -o max-reader-threads=${nDPId_THREADS} ${nDPId_ARGS} test $? -eq 0 || RETVAL=1 set +x printf '%s\n' "daemons started" >&2 |