|
From: <jud...@us...> - 2006-07-20 20:46:03
|
Revision: 316 Author: judith_osdl Date: 2006-07-20 13:45:57 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/stp/?rev=316&view=rev Log Message: ----------- Add a check for load before sending mail. Do not set status from client. We want that to happen fromthe receiving result end. Modified Paths: -------------- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm trunk/Test-Sut/lib/Test/Sut/Util/Log.pm Modified: trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 19:49:36 UTC (rev 315) +++ trunk/Test-Sut/lib/Test/Sut/Upload/Email.pm 2006-07-20 20:45:57 UTC (rev 316) @@ -42,12 +42,12 @@ sub upload_all { my ( $self ) = @_; + my $state='Completed'; if ( $self->{'sub_test_failure'} != 0 ){ - $self->set_test_request_status( "Failed" ); - } else { - $self->set_test_request_status( "Completed" ); - } + $state='Failed'; + } + `echo $state > "$ENV{'SYSTEM_LOGS'}/test_request_status.txt"`; # tar/bzip up results chdir $ENV{'RESULTS_ROOT'}; system "tar cvfj $ENV{'TEST_ID'}.tar.bz2 $ENV{'TEST_ID'}"; @@ -60,6 +60,8 @@ if ( $send_flag =~ m/yes|auto/i ){ $self->send_results(); } + # Only set state locally, because email receiving end will update database + #$self->set_test_request_status( $state ); chdir( $ENV{'EXEC_HOME'} ); return; @@ -153,7 +155,11 @@ sleep 2; $size -= 5000000; } - + + my $load = `uptime |sed 's/.*load average:\s\{1,\}\(.*\) //'`; + while ( $load > 10 ){ + sleep 30; + } if ( ! $msg->send() ){ $self->mail_user( " File Send Failure ($file)", Modified: trunk/Test-Sut/lib/Test/Sut/Util/Log.pm =================================================================== --- trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-20 19:49:36 UTC (rev 315) +++ trunk/Test-Sut/lib/Test/Sut/Util/Log.pm 2006-07-20 20:45:57 UTC (rev 316) @@ -71,7 +71,7 @@ sub msg{ my ( $self, $level, $message ) = @_; - if ( $level >= $self->{ 'level' }){ + if ( $level <= $self->{ 'level' }){ $self->log($message); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |