oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the getTTL method to find the time to pause running a Workflow.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-24 08:16:58 -07:00
parent adcc2690f3
commit 8ecf297931
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Workflow/Activity/CleanTempStorage.pm
View file

@ -102,8 +102,9 @@ See WebGUI::Workflow::Activity::execute() for details.
=cut =cut
sub execute { sub execute {
my $self = shift; my $self = shift;
my $start = time(); my $start = time();
my $stop = $start + $self->getTTL;
# kill temporary assets # kill temporary assets
my $tempspace = WebGUI::Asset->getTempspace($self->session); my $tempspace = WebGUI::Asset->getTempspace($self->session);
@ -125,11 +126,11 @@ sub execute {
} }
} }
# taking too long, give up # taking too long, give up
return $self->WAITING(1) if (time() - $start > $self->getTTL); return $self->WAITING(1) if (time() > $stop);
} }
# kill temporary files # kill temporary files
return $self->recurseFileSystem($start, $self->session->config->get("uploadsPath")."/temp"); return $self->recurseFileSystem($stop, $self->session->config->get("uploadsPath")."/temp");
} }
@ -147,7 +148,7 @@ The starting path.
sub recurseFileSystem { sub recurseFileSystem {
my $self = shift; my $self = shift;
my $start = shift; my $stop = shift;
my $path = shift; my $path = shift;
if (opendir(DIR,$path)) { if (opendir(DIR,$path)) {
my @filelist = readdir(DIR); my @filelist = readdir(DIR);
@ -155,10 +156,10 @@ sub recurseFileSystem {
foreach my $file (@filelist) { foreach my $file (@filelist) {
unless ($file eq "." || $file eq "..") { unless ($file eq "." || $file eq "..") {
# taking too long, time to abort # taking too long, time to abort
return $self->WAITING(1) if (time() - $start > 50); return $self->WAITING(1) if (time() > $stop);
# must search for children # must search for children
$self->recurseFileSystem($start, $path."/".$file); $self->recurseFileSystem($stop, $path."/".$file);
# if it's old enough, let's kill it # if it's old enough, let's kill it
if ($self->checkFileAge($path."/".$file)) { if ($self->checkFileAge($path."/".$file)) {

4
lib/WebGUI/Workflow/Activity/ExpirePurchasedThingyRecords.pm
View file

@ -111,7 +111,7 @@ sub execute {
$msg->addHtml( $self->get('notificationMessage') ); $msg->addHtml( $self->get('notificationMessage') );
$msg->queue; $msg->queue;
if ( time - $time > 60 ) { if ( time - $time > $self->getTTL ) {
return $self->WAITING(1); return $self->WAITING(1);
} }
} }
@ -140,7 +140,7 @@ sub execute {
$asset->deleteThingRecord( $asset->get('thingId'), $record->getId ); $asset->deleteThingRecord( $asset->get('thingId'), $record->getId );
if ( time - $time > 60 ) { if ( time - $time > $self->getTTL ) {
return $self->WAITING(1); return $self->WAITING(1);
} }
} }

2
lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
View file

@ -65,7 +65,7 @@ See WebGUI::Workflow::Activity::execute() for details.
sub execute { sub execute {
my ( $self, $obj, $instance ) = @_; my ( $self, $obj, $instance ) = @_;
my $timeLimit = time + 55; my $timeLimit = time + self->getTTL;
my $piped = $instance->getScratch('recurrences') my $piped = $instance->getScratch('recurrences')
|| $self->generateRecurrenceList(); || $self->generateRecurrenceList();