[checkmk-commits] Check_MK Git: check_mk: mk_oracle.aix: fix cache age computation, output cache meta information

Module: check_mk Branch: master Commit: f3d1a82acfb348843e60aadc715e0eeb2af5d3b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3d1a82acfb348… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon May 18 15:33:03 2015 +0200 mk_oracle.aix: fix cache age computation, output cache meta information --- agents/plugins/mk_oracle.aix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index cd2389d..fb1a1f6 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -948,8 +948,8 @@ export -f sqlplus_internal export -f do_async_checks export -f set_oraenv -function file_age() { - /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($^T-$mtime);' "$1" +function file_mtime() { + /usr/bin/perl -e 'if (! -f $ARGV[0]){die "0000000"};$mtime=(stat($ARGV[0]))[9];print ($mtime);' "$1" } function run_cached_local () { @@ -967,7 +967,7 @@ function run_cached_local () { # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE local NOW=$(date +%s) if [ -e "$CACHEFILE.new" ] ; then - CF_ATIME=$(file_age "$CACHEFILE.new") + CF_ATIME=$(file_mtime "$CACHEFILE.new") if [ $((NOW - CF_ATIME)) -ge $((MAXAGE * 2)) ] ; then # Kill the process still accessing that file in case # it is still running. This avoids overlapping processes! @@ -979,11 +979,11 @@ function run_cached_local () { # Check if cache file exists and is recent enough if [ -s "$CACHEFILE" ] ; then - MTIME=$(file_age "$CACHEFILE") + MTIME=$(file_mtime "$CACHEFILE") if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + sed "/^<<</s/>>>$/:cached($MTIME,$MAXAGE)>>>/" "$CACHEFILE" fi # Cache file outdated and new job not yet running? Start it