Browse Source

improved bytes validation

Serghey Rodin 13 years ago
parent
commit
14be9aa777
2 changed files with 2 additions and 2 deletions
  1. 1 1
      bin/v-update-web-domains-traff
  2. 1 1
      func/main.sh

+ 1 - 1
bin/v-update-web-domains-traff

@@ -43,7 +43,7 @@ for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do
 
     # Parsing log
     while read line; do
-        if [[ '-' != "$line" ]] && [[ 0 -lt "$line" ]]; then
+        if  [[ "$1" =~ ^[0-9]+$ ]]; then
             bytes=$(($bytes + $line))
         fi
     done < $log_file

+ 1 - 1
func/main.sh

@@ -110,7 +110,7 @@ is_package_full() {
     esac
     limit=$(grep "^$1=" $USER_DATA/user.conf | cut -f 2 -d \' )
     if [ "$used" -ge "$limit" ]; then
-	echo "Error: Limit reached / Upgrade package"
+        echo "Error: Limit reached / Upgrade package"
         log_event "$E_LIMIT" "$EVENT"
         exit $E_LIMIT
     fi