gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

commandadction to commandname

pull/934/head
Daniel Gibbs 9 years ago
parent
7cb0b97c57
commit
2319b8a2c1
1 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      lgsm/functions/core_messages.sh

72
lgsm/functions/core_messages.sh
View File

@ -25,8 +25,8 @@ fi
########## ##########
## Feb 28 14:56:58 ut99-server: Monitor: ## Feb 28 14:56:58 ut99-server: Monitor:
fn_script_log(){ fn_script_log(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> "${scriptlog}"
fi fi
@ -34,8 +34,8 @@ fn_script_log(){
## Feb 28 14:56:58 ut99-server: Monitor: PASS: ## Feb 28 14:56:58 ut99-server: Monitor: PASS:
fn_script_log_pass(){ fn_script_log_pass(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: PASS: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: PASS: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: PASS: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: PASS: ${1}" >> "${scriptlog}"
fi fi
@ -44,8 +44,8 @@ fn_script_log_pass(){
## Feb 28 14:56:58 ut99-server: Monitor: FATAL: ## Feb 28 14:56:58 ut99-server: Monitor: FATAL:
fn_script_log_fatal(){ fn_script_log_fatal(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: FATAL: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: FATAL: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: FATAL: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: FATAL: ${1}" >> "${scriptlog}"
fi fi
@ -54,8 +54,8 @@ fn_script_log_fatal(){
## Feb 28 14:56:58 ut99-server: Monitor: ERROR: ## Feb 28 14:56:58 ut99-server: Monitor: ERROR:
fn_script_log_error(){ fn_script_log_error(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: ERROR: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: ERROR: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ERROR: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ERROR: ${1}" >> "${scriptlog}"
fi fi
@ -64,8 +64,8 @@ fn_script_log_error(){
## Feb 28 14:56:58 ut99-server: Monitor: WARN: ## Feb 28 14:56:58 ut99-server: Monitor: WARN:
fn_script_log_warn(){ fn_script_log_warn(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: WARN: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: WARN: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: WARN: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: WARN: ${1}" >> "${scriptlog}"
fi fi
@ -74,8 +74,8 @@ fn_script_log_warn(){
## Feb 28 14:56:58 ut99-server: Monitor: INFO: ## Feb 28 14:56:58 ut99-server: Monitor: INFO:
fn_script_log_info(){ fn_script_log_info(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandaction}: INFO: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${commandname}: INFO: ${1}" >> "${scriptlog}"
else else
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: INFO: ${1}" >> "${scriptlog}" echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: INFO: ${1}" >> "${scriptlog}"
fi fi
@ -86,16 +86,16 @@ fn_script_log_info(){
# [ .... ] # [ .... ]
fn_print_dots(){ fn_print_dots(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[ .... ] ${commandaction} ${servicename}: $@" echo -en "${creeol}[ .... ] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[ .... ] $@" echo -en "${creeol}[ .... ] $@"
fi fi
} }
fn_print_dots_nl(){ fn_print_dots_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -e "${creeol}[ .... ] ${commandaction} ${servicename}: $@" echo -e "${creeol}[ .... ] ${commandname} ${servicename}: $@"
else else
echo -e "${creeol}[ .... ] $@" echo -e "${creeol}[ .... ] $@"
fi fi
@ -105,16 +105,16 @@ fn_print_dots_nl(){
# [ OK ] # [ OK ]
fn_print_ok(){ fn_print_ok(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${green} OK ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${green} OK ${default}] $@" echo -en "${creeol}[${green} OK ${default}] $@"
fi fi
} }
fn_print_ok_nl(){ fn_print_ok_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${green} OK ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${green} OK ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${green} OK ${default}] $@" echo -en "${creeol}[${green} OK ${default}] $@"
fi fi
@ -124,16 +124,16 @@ fn_print_ok_nl(){
# [ FAIL ] # [ FAIL ]
fn_print_fail(){ fn_print_fail(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${red} FAIL ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${red} FAIL ${default}] $@" echo -en "${creeol}[${red} FAIL ${default}] $@"
fi fi
} }
fn_print_fail_nl(){ fn_print_fail_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${red} FAIL ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${red} FAIL ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${red} FAIL ${default}] $@" echo -en "${creeol}[${red} FAIL ${default}] $@"
fi fi
@ -143,16 +143,16 @@ fn_print_fail_nl(){
# [ ERROR ] # [ ERROR ]
fn_print_error(){ fn_print_error(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${red}ERROR ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${red}ERROR ${default}] $@" echo -en "${creeol}[${red}ERROR ${default}] $@"
fi fi
} }
fn_print_error_nl(){ fn_print_error_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${red}ERROR ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${red}ERROR ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${red}ERROR ${default}] $@" echo -en "${creeol}[${red}ERROR ${default}] $@"
fi fi
@ -162,16 +162,16 @@ fn_print_error_nl(){
# [ WARN ] # [ WARN ]
fn_print_warn(){ fn_print_warn(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${yellow} WARN ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${yellow} WARN ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${yellow} WARN ${default}] $@" echo -en "${creeol}[${yellow} WARN ${default}] $@"
fi fi
} }
fn_print_warn_nl(){ fn_print_warn_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${yellow} WARN ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${yellow} WARN ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${yellow} WARN ${default}] $@" echo -en "${creeol}[${yellow} WARN ${default}] $@"
fi fi
@ -181,16 +181,16 @@ fn_print_warn_nl(){
# [ INFO ] # [ INFO ]
fn_print_info(){ fn_print_info(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${cyan} INFO ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${cyan} INFO ${default}] $@" echo -en "${creeol}[${cyan} INFO ${default}] $@"
fi fi
} }
fn_print_info_nl(){ fn_print_info_nl(){
if [ -n "${commandaction}" ]; then if [ -n "${commandname}" ]; then
echo -en "${creeol}[${cyan} INFO ${default}] ${commandaction} ${servicename}: $@" echo -en "${creeol}[${cyan} INFO ${default}] ${commandname} ${servicename}: $@"
else else
echo -en "${creeol}[${cyan} INFO ${default}] $@" echo -en "${creeol}[${cyan} INFO ${default}] $@"
fi fi

Write Preview
Loading…
Cancel
Save