upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-22 06:36:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: only write cache file if it changed

Browse source 
Tests sometimes fila when running multiple parallel tests using the
same cache file because it is written everytime a test parameter
is read. Since there is no locking, this might fail from time to time.
This commit is contained in:
Sven Nierlein 2013-09-18 11:03:00 +02:00 committed by Sven Nierlein
parent 065905e900
commit 843bbfb75a
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
NPTest.pm
View file

@ -422,6 +422,7 @@ sub LoadCache
{
return if exists( $CACHE{'_cache_loaded_'} );
my $fileContents = "";
if ( -f $CACHEFILENAME )
{
my( $fileHandle ) = new IO::File;
@ -432,44 +433,45 @@ sub LoadCache
return;
}
my( $fileContents ) = join( "\n", <$fileHandle> );
$fileContents = join("", <$fileHandle>);
$fileHandle->close();
chomp($fileContents);
my( $contentsRef ) = eval $fileContents;
%CACHE = %{$contentsRef};
}
$CACHE{'_cache_loaded_'} = 1;
$CACHE{'_cache_loaded_'} = 1;
$CACHE{'_original_cache'} = $fileContents;
}
sub SaveCache
{
delete $CACHE{'_cache_loaded_'};
my $oldFileContents = delete $CACHE{'_original_cache'};
my( $fileHandle ) = new IO::File;
if ( ! $fileHandle->open( "> ${CACHEFILENAME}" ) )
{
print STDERR "NPTest::LoadCache() : Problem saving ${CACHEFILENAME} : $!\n";
return;
}
my( $dataDumper ) = new Data::Dumper( [ \%CACHE ] );
my($dataDumper) = new Data::Dumper([\%CACHE]);
$dataDumper->Terse(1);
$dataDumper->Sortkeys(1);
my $data = $dataDumper->Dump();
$data =~ s/^\s+/ /gmx; # make sure all systems use same amount of whitespace
$data =~ s/^\s+}/}/gmx;
print $fileHandle $data;
chomp($data);
$fileHandle->close();
if($oldFileContents ne $data) {
my($fileHandle) = new IO::File;
if (!$fileHandle->open( "> ${CACHEFILENAME}")) {
print STDERR "NPTest::LoadCache() : Problem saving ${CACHEFILENAME} : $!\n";
return;
}
print $fileHandle $data;
$fileHandle->close();
}
$CACHE{'_cache_loaded_'} = 1;
$CACHE{'_cache_loaded_'} = 1;
$CACHE{'_original_cache'} = $data;
}
#