diff options
author | Ivan Kohler <ivan@freeside.biz> | 2014-07-26 15:18:33 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2014-07-26 15:18:33 -0700 |
commit | 7caec8842cb8959515204b45aef368f243e87e33 (patch) | |
tree | f615e7134282eaa714e36da4db2a361cde21a703 | |
parent | 02bf58c3c5db507d4652d24b1788208ca6c4d759 (diff) |
queue statistics, RT#30238
-rw-r--r-- | FS/FS.pm | 2 | ||||
-rw-r--r-- | FS/FS/queue_stat.pm | 129 | ||||
-rw-r--r-- | FS/MANIFEST | 2 | ||||
-rw-r--r-- | FS/bin/freeside-queued | 17 | ||||
-rw-r--r-- | FS/t/queue_stat.t | 5 |
5 files changed, 155 insertions, 0 deletions
@@ -472,6 +472,8 @@ L<FS::queue_arg> - Job arguments L<FS::queue_depend> - Job dependencies +L<FS::queue_stat> - Job statistics + L<FS::msg_template> - Message templates (customer notices) L<FS::msgcat> - Message catalogs (error messages) diff --git a/FS/FS/queue_stat.pm b/FS/FS/queue_stat.pm new file mode 100644 index 0000000..c8e7791 --- /dev/null +++ b/FS/FS/queue_stat.pm @@ -0,0 +1,129 @@ +package FS::queue_stat; +use base qw( FS::Record ); + +use strict; +#use FS::Record qw( qsearch qsearchs ); + +=head1 NAME + +FS::queue_stat - Object methods for queue_stat records + +=head1 SYNOPSIS + + use FS::queue_stat; + + $record = new FS::queue_stat \%hash; + $record = new FS::queue_stat { 'column' => 'value' }; + + $error = $record->insert; + + $error = $new_record->replace($old_record); + + $error = $record->delete; + + $error = $record->check; + +=head1 DESCRIPTION + +An FS::queue_stat object represents statistcs about a completed (queued) job. +FS::queue_stat inherits from FS::Record. The following fields are currently +supported: + +=over 4 + +=item statnum + +primary key + +=item jobnum + +jobnum + +=item job + +job + +=item custnum + +custnum + +=item insert_date + +insert_date + +=item start_date + +start_date + +=item end_date + +end_date + +=back + +=head1 METHODS + +=over 4 + +=item new HASHREF + +Creates a new record. To add the record 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<hash> method. + +=cut + +sub table { 'queue_stat'; } + +=item insert + +Adds this record to the database. If there is an error, returns the error, +otherwise returns false. + +=item delete + +Delete this record from the database. + +=item replace OLD_RECORD + +Replaces the OLD_RECORD with this one in the database. If there is an error, +returns the error, otherwise returns false. + +=item check + +Checks all fields to make sure this is a valid record. If there is +an error, returns the error, otherwise returns false. Called by the insert +and replace methods. + +=cut + +sub check { + my $self = shift; + + my $error = + $self->ut_numbern('statnum') + || $self->ut_number('jobnum') + || $self->ut_text('job') + || $self->ut_numbern('custnum') + || $self->ut_number('insert_date') + || $self->ut_number('start_date') + || $self->ut_number('end_date') + ; + return $error if $error; + + $self->SUPER::check; +} + +=back + +=head1 BUGS + +=head1 SEE ALSO + +L<FS::Record> + +=cut + +1; + diff --git a/FS/MANIFEST b/FS/MANIFEST index ef9fb44..693904d 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -810,3 +810,5 @@ FS/state.pm t/state.t FS/state.pm t/state.t +FS/queue_stat.pm +t/queue_stat.t diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued index f1a87ca..70d8534 100644 --- a/FS/bin/freeside-queued +++ b/FS/bin/freeside-queued @@ -11,6 +11,7 @@ use FS::Conf; use FS::Record qw(qsearch); use FS::queue; use FS::queue_depend; +use FS::queue_stat; use FS::Log; use FS::Cron::expire_user_pref qw( expire_user_pref ); @@ -140,6 +141,8 @@ while (1) { foreach my $job ( @jobs ) { + my $start_date = time; + $log->debug('locking queue job', object => $job); my %hash = $job->hash; @@ -236,6 +239,20 @@ while (1) { dbh->commit; # for the job itself } + if ( $ljob->job eq 'FS::cust_main::queued_bill' ) { + my $queue_stat = new FS::queue_stat { + 'jobnum' => $ljob->jobnum, + 'job' => $ljob->job, + 'custnum' => $ljob->custnum, + 'insert_date' => $ljob->_date, + 'start_date' => $start_date, + 'end_date' => time, + }; + my $error = $queue_stat->insert; + die $error if $error; + dbh->commit; #for the stat + } + if ( UNIVERSAL::can(dbh, 'sprintProfile') ) { open(PROFILE,">%%%FREESIDE_LOG%%%/queueprofile.$$.".time) or die "can't open profile file: $!"; diff --git a/FS/t/queue_stat.t b/FS/t/queue_stat.t new file mode 100644 index 0000000..7ba0cfe --- /dev/null +++ b/FS/t/queue_stat.t @@ -0,0 +1,5 @@ +BEGIN { $| = 1; print "1..1\n" } +END {print "not ok 1\n" unless $loaded;} +use FS::queue_stat; +$loaded=1; +print "ok 1\n"; |