diff --git a/scripts/nebula.service b/scripts/nebula.service index eef028a9e..64739bb20 100755 --- a/scripts/nebula.service +++ b/scripts/nebula.service @@ -210,6 +210,7 @@ function kill_daemon { # args: [config file] function status_daemon { local daemon_name=nebula-${1} + local daemon_version=$(daemon_version ${INSTALL_ROOT}/bin/${daemon_name}) local config=${2} [[ -z ${config} ]] && config=${INSTALL_ROOT}/etc/${daemon_name}.conf @@ -224,9 +225,9 @@ function status_daemon { else port=${BLINK}${RED}${port}${NC} fi - INFO "${daemon_name}: Running as $(cat ${pid_file}), Listening on ${port}" + INFO "${daemon_name}(${daemon_version}): Running as $(cat ${pid_file}), Listening on ${port}" else - INFO "${daemon_name}: Exited" + INFO "${daemon_name}(${daemon_version}): Exited" fi } diff --git a/scripts/utils.sh b/scripts/utils.sh index 6ead94df1..55f7df6a6 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -148,3 +148,10 @@ function env_check { WARN "The CPU time a process can consume is restricted to ${cputime}" fi } + +# Get the daemon Git commit version information +function daemon_version { + local version=$(${1} --version | head -n 1) + echo ${version} | sed 's/.*Git: \([[:alnum:]]*\).*/\1/g' +} +