check_pgsql: Determine connection time in µs-resolution.

[nagiosplug.git] / plugins-scripts / check_log.sh

diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index 8145bba935b60aa0d228058baaddd7af5223023e..a1bfb486c7afa021f5d374de30d8e5cf8bcf4b23 100755 (executable)
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -57,8 +57,8 @@
 
 # Paths to commands used in this script.  These
 # may have to be modified to match your system setup.
-
-PATH=""
+# TV: removed PATH restriction. Need to think more about what this means overall
+#PATH=""
 
 ECHO="/bin/echo"
 GREP="/bin/egrep"
@@ -70,8 +70,8 @@ CHMOD="/bin/chmod"
 TOUCH="/bin/touch"
 
 PROGNAME=`/bin/basename $0`
-PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | /bin/sed -e 's/[^0-9.]//g'`
+PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
+REVISION="@NP_VERSION@"
 
 . $PROGPATH/utils.sh
 
@@ -116,11 +116,11 @@ while test -n "$1"; do
             exit $STATE_OK
             ;;
         --version)
-            print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $REVISION
             exit $STATE_OK
             ;;
         -V)
-            print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $REVISION
             exit $STATE_OK
             ;;
         --filename)
@@ -197,7 +197,7 @@ else
     $CHMOD 600 $tempdiff
 fi
 
-$DIFF $logfile $oldlog > $tempdiff
+$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff
 
 # Count the number of matching log entries we have
 count=`$GREP -c "$query" $tempdiff`