github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 21:04:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

json listing support

Browse source
This commit is contained in:
Serghey Rodin 2015-10-21 20:29:01 +03:00
commit fa570e4009
2 changed files with 78 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
bin/v-list-web-domain-accesslog
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# info: list web domain access log # info: list web domain access log
# options: USER DOMAIN [LINES] # options: USER DOMAIN [LINES] [FORMAT]
# #
# The function of obtaining raw access web domain logs. # The function of obtaining raw access web domain logs.
@ -12,33 +12,66 @@
# Argument defenition # Argument defenition
user=$1 user=$1
domain=$2 domain=$2
lines=${3-70} ttl=${3-70}
format=${4-shell}
# Includes # Includes
source $VESTA/func/main.sh source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf source $VESTA/conf/vesta.conf
# Json function
json_list_log() {
i=1
echo '['
for str in $lines; do
str=$(echo "$str" |sed -e 's/"/\\"/g')
if [ "$i" -lt "$counter" ]; then
echo -e "\t\"$str\","
else
echo -e "\t\"$str\""
fi
(( ++i))
done
echo "]"
}
# Shell function
shell_list_log() {
echo "$lines"
}
#----------------------------------------------------------# #----------------------------------------------------------#
# Verifications # # Verifications #
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [FORMAT]' check_args '2' "$#" 'USER DOMAIN [LINES] [FORMAT]'
validate_format 'user' 'domain' 'ttl'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain" is_object_valid 'web' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Check number of output lines # Check number of output lines
if [ "$lines" -gt '3000' ]; then if [ "$ttl" -gt '3000' ]; then
read_cmd="cat" read_cmd="cat"
else else
read_cmd="tail -n $lines" read_cmd="tail -n $ttl"
fi fi
$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.log lines=$($read_cmd /var/log/$WEB_SYSTEM/domains/$domain.log)
counter=$(echo "$lines" |wc -l)
IFS=$'\n'
# Listing logs
case $format in
json) json_list_log ;;
plain) shell_list_log ;;
shell) shell_list_log ;;
esac
#----------------------------------------------------------# #----------------------------------------------------------#

45
bin/v-list-web-domain-errorlog
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# info: list web domain error log # info: list web domain error log
# options: USER DOMAIN [LINES] # options: USER DOMAIN [LINES] [FORMAT]
# #
# The function of obtaining raw error web domain logs. # The function of obtaining raw error web domain logs.
@ -12,33 +12,66 @@
# Argument defenition # Argument defenition
user=$1 user=$1
domain=$2 domain=$2
lines=${3-70} ttl=${3-70}
format=${4-shell}
# Includes # Includes
source $VESTA/func/main.sh source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf source $VESTA/conf/vesta.conf
# Json function
json_list_log() {
i=1
echo '['
for str in $lines; do
str=$(echo "$str" |sed -e 's/"/\\"/g')
if [ "$i" -lt "$counter" ]; then
echo -e "\t\"$str\","
else
echo -e "\t\"$str\""
fi
(( ++i))
done
echo "]"
}
# Shell function
shell_list_log() {
echo "$lines"
}
#----------------------------------------------------------# #----------------------------------------------------------#
# Verifications # # Verifications #
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [FORMAT]' check_args '2' "$#" 'USER DOMAIN [LINES] [FORMAT]'
validate_format 'user' 'domain' 'ttl'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain" is_object_valid 'web' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Check number of output lines # Check number of output lines
if [ "$lines" -gt '3000' ]; then if [ "$ttl" -gt '3000' ]; then
read_cmd="cat" read_cmd="cat"
else else
read_cmd="tail -n $lines" read_cmd="tail -n $ttl"
fi fi
$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.error.log lines=$($read_cmd /var/log/$WEB_SYSTEM/domains/$domain.error.log)
counter=$(echo "$lines" |wc -l)
IFS=$'\n'
# Listing logs
case $format in
json) json_list_log ;;
plain) shell_list_log ;;
shell) shell_list_log ;;
esac
#----------------------------------------------------------# #----------------------------------------------------------#