diff --git a/usr/local/lib/vpn.bash b/usr/local/lib/vpn.bash index 71d716b..5ffea77 100644 --- a/usr/local/lib/vpn.bash +++ b/usr/local/lib/vpn.bash @@ -465,13 +465,23 @@ vpn_status() # cat ${VPN_STATUS_FILE} # fi - echo -e "Id | Name | PId | Date | Command" - echo "-----------------------------------------------------------------------------------------------------------------------------------------------------------------------" + echo -e "Id | Name | Status | PId | Date | Command" + echo "--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------" for job_id in ${VPN_JOB_ID_LIST} do vpn_job_tab_get "${job_id}" - printf "%-*s | %-*s | %-*s | %-*s | %-*s\n" 8 "${job_id}" 24 "${job_name}" 8 "${job_pid}" 32 "${job_date}" 8 "${job_cmd}" + ${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null + rc=$? + + if [[ "${job_pid}" == "0" ]] || [[ $rc != 0 ]] + then + job_status="Down" + else + job_status="Up" + fi + + printf "%-*s | %-*s | %-*s | %-*s | %-*s | %-*s\n" 8 "${job_id}" 24 "${job_name}" 8 ${job_status} 8 "${job_pid}" 32 "${job_date}" 8 "${job_cmd}" done }