X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-queued;h=5eac06b249b35ebbb71875968e73208cc74e03ef;hb=23db52e232596d87b97561f5f76f11668cbe33bd;hp=2fd80255ed86b9e88eeb7d6f831c1b0561a73b0c;hpb=96783bdc58be6e4f2fc56d516a9ceba57af00ba8;p=freeside.git

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 2fd80255e..5eac06b24 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -212,8 +212,10 @@ while (1) {
       # don't put @args in the log, may expose passwords
       $log->info('starting job ('.$ljob->job.')');
       warn 'running "&'. $ljob->job. '('. join(', ', @args). ")\n" if $DEBUG;
+      local $FS::UID::AutoCommit = 0; # so that we can clean up failures
       eval $eval; #throw away return value?  suppose so
       if ( $@ ) {
+        dbh->rollback;
         my %hash = $ljob->hash;
         $hash{'statustext'} = $@;
         if ( $hash{'statustext'} =~ /\/misc\/queued_report/ ) { #use return?
@@ -225,8 +227,10 @@ while (1) {
         my $fjob = new FS::queue( \%hash );
         my $error = $fjob->replace($ljob);
         die $error if $error;
+        dbh->commit; # for the status change only
       } else {
         $ljob->delete;
+        dbh->commit; # for the job itself
       }
 
       if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
@@ -292,7 +296,7 @@ Job queue daemon.  Should be running at all times.
 
 -n: non-"secure" jobs only (other jobs)
 
-user: from the mapsecrets file - see config.html from the base documentation
+user: Typically "fs_queue"
 
 =head1 VERSION