X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fqueue.pm;h=3f8763da8dcca766307ed6a53fea783aaa88fbf6;hb=fb1ac8b894c138a3a04c1d5941c969c99cd3d3f4;hp=e5369cf820295ca974619c3b218574e9efccfb38;hpb=7dc23049c25d316da196647a8be1d74dfc09a02a;p=freeside.git diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm index e5369cf82..3f8763da8 100644 --- a/FS/FS/queue.pm +++ b/FS/FS/queue.pm @@ -1,22 +1,30 @@ package FS::queue; use strict; -use vars qw( @ISA @EXPORT_OK $conf ); +use vars qw( @ISA @EXPORT_OK $DEBUG $conf $jobnums); use Exporter; -use FS::UID; +use MIME::Base64; +use Storable qw( nfreeze thaw ); +use FS::UID qw(myconnect); use FS::Conf; use FS::Record qw( qsearch qsearchs dbh ); #use FS::queue; use FS::queue_arg; +use FS::queue_depend; use FS::cust_svc; +use FS::CGI qw(rooturl); @ISA = qw(FS::Record); @EXPORT_OK = qw( joblisting ); +$DEBUG = 0; + $FS::UID::callback{'FS::queue'} = sub { $conf = new FS::Conf; }; +$jobnums = ''; + =head1 NAME FS::queue - Object methods for queue records @@ -43,17 +51,54 @@ FS::Record. The following fields are currently supported: =over 4 -=item jobnum - primary key +=item jobnum + +Primary key + +=item job + +Fully-qualified subroutine name + +=item status + +Job status (new, locked, or failed) + +=item statustext + +Freeform text status message + +=cut + +sub statustext { + my $self = shift; + if ( defined ( $_[0] ) ) { + $self->SUPER::statustext(@_); + } else { + my $value = $self->SUPER::statustext(); + my $rooturl = rooturl(); + $value =~ s/%%%ROOTURL%%%/$rooturl/g; + $value; + } +} + +=item _date + +UNIX timestamp + +=item svcnum -=item job - fully-qualified subroutine name +Optional link to service (see L). -=item status - job status +=item custnum -=item statustext - freeform text status message +Optional link to customer (see L). -=item _date - UNIX timestamp +=item secure -=item svcnum - optional link to service (see L) +Secure flag, 'Y' indicates that when using encryption, the job needs to be +run on a machine with the private key. + +=cut =back @@ -63,7 +108,7 @@ FS::Record. The following fields are currently supported: =item new HASHREF -Creates a new job. To add the example to the database, see L<"insert">. +Creates a new job. To add the job to the database, see L<"insert">. Note that this stores the hash reference, not a distinct copy of the hash it points to. You can ask the object for a copy with the I method. @@ -86,7 +131,7 @@ created (see L). #false laziness w/part_export.pm sub insert { - my $self = shift; + my( $self, @args ) = @_; local $SIG{HUP} = 'IGNORE'; local $SIG{INT} = 'IGNORE'; @@ -99,16 +144,26 @@ sub insert { local $FS::UID::AutoCommit = 0; my $dbh = dbh; + my %args = (); + { + no warnings "misc"; + %args = @args; + } + + $self->custnum( $args{'custnum'} ) if $args{'custnum'}; + my $error = $self->SUPER::insert; if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; } - foreach my $arg ( @_ ) { + foreach my $arg ( @args ) { + my $freeze = ref($arg) ? 'Y' : ''; my $queue_arg = new FS::queue_arg ( { 'jobnum' => $self->jobnum, - 'arg' => $arg, + 'frozen' => $freeze, + 'arg' => $freeze ? encode_base64(nfreeze($arg)) : $arg,# always freeze? } ); $error = $queue_arg->insert; if ( $error ) { @@ -117,6 +172,11 @@ sub insert { } } + if ( $jobnums ) { + warn "jobnums global is active: $jobnums\n" if $DEBUG; + push @$jobnums, $self->jobnum; + } + $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; @@ -144,7 +204,16 @@ sub delete { local $FS::UID::AutoCommit = 0; my $dbh = dbh; - my @args = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } ); + my @del = qsearch( 'queue_arg', { 'jobnum' => $self->jobnum } ); + push @del, qsearch( 'queue_depend', { 'depend_jobnum' => $self->jobnum } ); + + my $reportname = ''; + if ( $self->status =~/^done/ ) { + my $dropstring = rooturl(). '/misc/queued_report\?report='; + if ($self->statustext =~ /.*$dropstring([.\w]+)\>/) { + $reportname = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/report.$1"; + } + } my $error = $self->SUPER::delete; if ( $error ) { @@ -152,8 +221,8 @@ sub delete { return $error; } - foreach my $arg ( @args ) { - $error = $arg->delete; + foreach my $del ( @del ) { + $error = $del->delete; if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; @@ -161,6 +230,8 @@ sub delete { } $dbh->commit or die $dbh->errstr if $oldAutoCommit; + + unlink $reportname if $reportname; ''; @@ -189,8 +260,8 @@ sub check { $self->ut_numbern('jobnum') || $self->ut_anything('job') || $self->ut_numbern('_date') - || $self->ut_enum('status',['', qw( new locked failed )]) - || $self->ut_textn('statustext') + || $self->ut_enum('status',['', qw( new locked failed done )]) + || $self->ut_anything('statustext') || $self->ut_numbern('svcnum') ; return $error if $error; @@ -201,20 +272,23 @@ sub check { $self->status('new') unless $self->status; $self->_date(time) unless $self->_date; - ''; #no error + $self->SUPER::check; } =item args +Returns a list of the arguments associated with this job. + =cut sub args { my $self = shift; - map $_->arg, qsearch( 'queue_arg', - { 'jobnum' => $self->jobnum }, - '', - 'ORDER BY argnum' - ); + map { $_->frozen ? thaw(decode_base64($_->arg)) : $_->arg } + qsearch( 'queue_arg', + { 'jobnum' => $self->jobnum }, + '', + 'ORDER BY argnum' + ); } =item cust_svc @@ -228,6 +302,109 @@ sub cust_svc { qsearchs('cust_svc', { 'svcnum' => $self->svcnum } ); } +=item queue_depend + +Returns the FS::queue_depend objects associated with this job, if any. +(Dependancies that must complete before this job can be run). + +=cut + +sub queue_depend { + my $self = shift; + qsearch('queue_depend', { 'jobnum' => $self->jobnum } ); +} + +=item depend_insert OTHER_JOBNUM + +Inserts a dependancy for this job - it will not be run until the other job +specified completes. If there is an error, returns the error, otherwise +returns false. + +When using job dependancies, you should wrap the insertion of all relevant jobs +in a database transaction. + +=cut + +sub depend_insert { + my($self, $other_jobnum) = @_; + my $queue_depend = new FS::queue_depend ( { + 'jobnum' => $self->jobnum, + 'depend_jobnum' => $other_jobnum, + } ); + $queue_depend->insert; +} + +=item queue_depended + +Returns the FS::queue_depend objects that associate other jobs with this job, +if any. (The jobs that are waiting for this job to complete before they can +run). + +=cut + +sub queue_depended { + my $self = shift; + qsearch('queue_depend', { 'depend_jobnum' => $self->jobnum } ); +} + +=item depended_delete + +Deletes the other queued jobs (FS::queue objects) that are waiting for this +job, if any. If there is an error, returns the error, otherwise returns false. + +=cut + +sub depended_delete { + my $self = shift; + my $error; + foreach my $job ( + map { qsearchs('queue', { 'jobnum' => $_->jobnum } ) } $self->queue_depended + ) { + $error = $job->depended_delete; + return $error if $error; + $error = $job->delete; + return $error if $error + } +} + +=item update_statustext VALUE + +Updates the statustext value of this job to supplied value, in the database. +If there is an error, returns the error, otherwise returns false. + +=cut + +use vars qw($_update_statustext_dbh); +sub update_statustext { + my( $self, $statustext ) = @_; + return '' if $statustext eq $self->get('statustext'); #avoid rooturl expansion + warn "updating statustext for $self to $statustext" if $DEBUG; + + $_update_statustext_dbh ||= myconnect; + + my $sth = $_update_statustext_dbh->prepare( + 'UPDATE queue set statustext = ? WHERE jobnum = ?' + ) or return $_update_statustext_dbh->errstr; + + $sth->execute($statustext, $self->jobnum) or return $sth->errstr; + $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr; + $self->set('statustext', $statustext); #avoid rooturl expansion + ''; + + #my $new = new FS::queue { $self->hash }; + #$new->statustext($statustext); + #my $error = $new->replace($self); + #return $error if $error; + #$self->statustext($statustext); + #''; +} + +=back + +=head1 SUBROUTINES + +=over 4 + =item joblisting HASHREF NOACTIONS =cut @@ -236,12 +413,16 @@ sub joblisting { my($hashref, $noactions) = @_; use Date::Format; + use HTML::Entities; use FS::CGI; my @queue = qsearch( 'queue', $hashref ); return '' unless scalar(@queue); - my $html = FS::CGI::table(). <!. + FS::CGI::table(). < Job Args @@ -251,18 +432,34 @@ END $html .= 'Account' unless $hashref->{svcnum}; $html .= ''; - my $p = FS::CGI::popurl(2); + my $dangerous = $conf->exists('queue_dangerous_controls'); + + my $areboxes = 0; + foreach my $queue ( sort { $a->getfield('jobnum') <=> $b->getfield('jobnum') } @queue ) { my $queue_hashref = $queue->hashref; my $jobnum = $queue->jobnum; - my $args = join(' ', $queue->args); + + my $args; + if ( $dangerous || $queue->job !~ /^FS::part_export::/ || !$noactions ) { + $args = encode_entities( join(' ', $queue->args) ); + } else { + $args = ''; + } + my $date = time2str( "%a %b %e %T %Y", $queue->_date ); my $status = $queue->status; $status .= ': '. $queue->statustext if $queue->statustext; - if ( $conf->exists('queue_dangerous_controls') - || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ) ) { + my @queue_depend = $queue->queue_depend; + $status .= ' (waiting for '. + join(', ', map { $_->depend_jobnum } @queue_depend ). + ')' + if @queue_depend; + my $changable = $dangerous + || ( ! $noactions && $status =~ /^failed/ || $status =~ /^locked/ ); + if ( $changable ) { $status .= qq! ( retry |!. qq! remove )!; @@ -291,24 +488,34 @@ END $html .= "$account"; } + if ( $changable ) { + $areboxes=1; + $html .= + qq!!; + + } + $html .= ''; } $html .= ''; + if ( $areboxes ) { + $html .= '
'. + '
'; + } + $html; } =back -=head1 VERSION - -$Id: queue.pm,v 1.9 2002-03-24 14:29:00 ivan Exp $ - =head1 BUGS +$jobnums global + =head1 SEE ALSO L, schema.html from the base documentation.