Changeset 3433

Show
Ignore:
Timestamp:
03/17/10 11:45:11 (2 years ago)
Author:
ligne
Message:

prevent a spike in the graph after Amavis is restarted. Thanks to claudius for the patch. fixes ticket #889.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/plugins/node.d/amavis.in

    r3353 r3433  
    11#!@@GOODSH@@ 
    22# -*- sh -*- 
     3# vim: ft=sh 
    34 
    45: <<=cut 
    …… 
    106107if [ "$1" = "config" ]; then 
    107108        echo 'graph_title Amavis filter statistics' 
    108         echo 'graph_vlabel #' 
     109        echo 'graph_vlabel \#' 
    109110        echo 'graph_category antivirus' 
    110111        echo 'virus.label virus' 
    …… 
    133134            $LOGTAIL ${AMAVIS_LOG} ${STATEFILE} | grep 'amavis\[.*\]:' > ${TEMP_FILE} 
    134135        fi 
    135         total=$(cat ${TEMP_FILE} | wc -l) 
    136         virus=$(grep INFECTED ${TEMP_FILE} | wc -l) 
    137         spamm=$(grep 'Passed.*Hits: 1[0-9][.]' ${TEMP_FILE} | wc -l) 
    138         spams=$(grep 'Passed.*Hits: [2-9][0-9][0-9]*[.]' ${TEMP_FILE} | wc -l) 
     136        total=$(grep -c 'Passed' ${TEMP_FILE}) 
     137        virus=$(grep -c 'INFECTED' ${TEMP_FILE}) 
     138        spamm=$(grep -c 'Passed.*Hits: 1[0-9][.]' ${TEMP_FILE}) 
     139        spams=$(grep -c 'Passed.*Hits: [2-9][0-9][0-9]*[.]' ${TEMP_FILE}) 
    139140 
    140141        /bin/rm -f $TEMP_FILE 
    …… 
    145146echo "spam_sure.value ${spams}" 
    146147echo "total.value ${total}" 
     148