3 Commits

21
rsm
View File

@@ -9,9 +9,11 @@
# Date: August 29, 2018 # Date: August 29, 2018
# License: MIT # License: MIT
RSM_VERSION='v1.4.0' RSM_VERSION='v1.4.2'
export SVDIR=${SVDIR:-/run/runit/service/} export SVDIR=${SVDIR:-/run/runit/service/}
export LOGDIR="/var/log/"
export RSVDIR="/run/runit/service/"
export FLDIR=${FLDIR:-/etc/runit/sv/} export FLDIR=${FLDIR:-/etc/runit/sv/}
@@ -166,6 +168,10 @@ ${colorgreen}start <service> $cr Start the service
${colorgreen}stop <service> $cr Stop the service ${colorgreen}stop <service> $cr Stop the service
${colorgreen}restart <service> $cr Restart the service ${colorgreen}restart <service> $cr Restart the service
${colorgreen}reload <service> $cr Reload the service (send SIGHUP) ${colorgreen}reload <service> $cr Reload the service (send SIGHUP)
${colorgreen}logs <service> $cr Outputs the service's logfilenames and their access & error logs from /var/log/<serice>/
${colorgreen}alllogs <service> $cr The same like logs <service>
${colorgreen}errorlogs <service> $cr Outputs the service's logfilenames and their errorlogs from /var/log/<serice>/
${coloryellow}EXAMPLES:${colorgreen} ${coloryellow}EXAMPLES:${colorgreen}
${colorgreen}$progname $cr Show service status in /var/service ${colorgreen}$progname $cr Show service status in /var/service
@@ -494,8 +500,6 @@ do_enable_disable() {
# show logs # show logs
do_show_logs() { do_show_logs() {
local LOGDIR="/var/log/"
local SVDIR="/run/runit/service/"
monitors_array=($(xrandr -q)) monitors_array=($(xrandr -q))
local cmd=$1 local cmd=$1
local svc local svc
@@ -514,7 +518,7 @@ do_show_logs() {
fi fi
done done
if ! [[ -d ${SVDIR}${cmd} ]]; then if ! [[ -d ${RSVDIR}${cmd} ]]; then
printf "\n%20s\n" "${colorgreen}The following log files found:" printf "\n%20s\n" "${colorgreen}The following log files found:"
local logs_files_array=($(ls /var/log/$cmd/*.*)) local logs_files_array=($(ls /var/log/$cmd/*.*))
printf "\n$colorblue" printf "\n$colorblue"
@@ -538,9 +542,6 @@ do_show_logs() {
# show error logs # show error logs
do_show_err_logs() { do_show_err_logs() {
local LOGDIR="/var/log/"
local SVDIR="/run/runit/service/"
monitors_array=($(xrandr -q))
local cmd=$1 local cmd=$1
local svc local svc
local ret=0 local ret=0
@@ -558,9 +559,9 @@ do_show_err_logs() {
fi fi
done done
if ! [[ -d ${SVDIR}${cmd} ]]; then if ! [[ -d ${RSVDIR}${cmd} ]]; then
printf "\n%20s\n" "${colorgreen}The following log files found:" printf "\n%20s\n" "${colorred}The following error log files found:"
local logs_files_array=($(ls /var/log/$cmd/*.*)) local logs_files_array=($(ls /var/log/$cmd/*error*.*))
printf "\n$colorblue" printf "\n$colorblue"
printf '%s\n' "${logs_files_array[@]}" printf '%s\n' "${logs_files_array[@]}"