scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-11-01 18:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved make daemon / daemon.sh to accept nDPId / nDPIsrvd arguments via env.

Browse Source 
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2022-11-11 07:05:29 +01:00
parent ce567ae5b7
commit 869d4de271
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -86,7 +86,7 @@ add_custom_command(
add_custom_target(daemon) add_custom_target(daemon)
add_custom_command( add_custom_command(
TARGET daemon 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 DEPENDS nDPId nDPIsrvd
) )

12
scripts/daemon.sh
View File

@@ -7,11 +7,15 @@ NROOT="${NROOT:-/tmp}"
NUSER="${NUSER:-$(id -u -n)}" NUSER="${NUSER:-$(id -u -n)}"
NSUFFIX="${NSUFFIX:-daemon-test}" NSUFFIX="${NSUFFIX:-daemon-test}"
nDPId_THREADS="${nDPId_THREADS:-4}" nDPId_THREADS="${nDPId_THREADS:-4}"
nDPId_ARGS="${nDPId_ARGS:-}"
nDPIsrvd_ARGS="${nDPIsrvd_ARGS:-}"
if [ x"${1}" = x -o x"${2}" = x ]; then if [ x"${1}" = x -o x"${2}" = x ]; then
printf '%s\n' "usage: ${0} [nDPId-path] [nDPIsrvd-path]" >&2 printf '%s\n' "usage: ${0} [nDPId-path] [nDPIsrvd-path]" >&2
printf '\n\t%s=%s\n' 'env NUSER' "${NUSER}" >&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 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 exit 1
fi fi
@@ -42,7 +46,7 @@ if [ -r "${NROOT}/nDPId-${NSUFFIX}.pid" -o -r "${NROOT}/nDPIsrvd-${NSUFFIX}.pid"
printf '%s\n' "daemons stopped" >&2 printf '%s\n' "daemons stopped" >&2
else else
set -x 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 test $? -eq 0 || RETVAL=1
MAX_TRIES=10 MAX_TRIES=10
@@ -63,7 +67,7 @@ else
test $? -eq 0 || RETVAL=1 test $? -eq 0 || RETVAL=1
sudo chmod g+w "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock" sudo chmod g+w "${NROOT}/nDPIsrvd-${NSUFFIX}-collector.sock"
test $? -eq 0 || RETVAL=1 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 test $? -eq 0 || RETVAL=1
set +x set +x
printf '%s\n' "daemons started" >&2 printf '%s\n' "daemons started" >&2