[freeside-commits] branch FREESIDE_3_BRANCH updated. 40ae0a48812971c84c4bc90e21d8cfb04155a96c

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  40ae0a48812971c84c4bc90e21d8cfb04155a96c (commit)
      from  4faed517720e6ccf37e407dcf2856fd49a98a84b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40ae0a48812971c84c4bc90e21d8cfb04155a96c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jul 26 15:18:33 2014 -0700

    queue statistics, RT#30238

diff --git a/FS/FS.pm b/FS/FS.pm
index 41d8f44..3c003c3 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -448,6 +448,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 764de9a..a8dfbc1 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -762,3 +762,5 @@ FS/export_batch.pm
 t/export_batch.t
 FS/export_batch_item.pm
 t/export_batch_item.t
+FS/queue_stat.pm
+t/queue_stat.t
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 2a88c56..5eeed84 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";

-----------------------------------------------------------------------

Summary of changes:
 FS/FS.pm                                |    2 ++
 FS/FS/{cable_model.pm => queue_stat.pm} |   58 +++++++++++++++++++++----------
 FS/MANIFEST                             |    2 ++
 FS/bin/freeside-queued                  |   17 +++++++++
 FS/t/{ConfItem.t => queue_stat.t}       |    2 +-
 5 files changed, 61 insertions(+), 20 deletions(-)
 copy FS/FS/{cable_model.pm => queue_stat.pm} (58%)
 copy FS/t/{ConfItem.t => queue_stat.t} (83%)