diff options
| author | Mark Wells <mark@freeside.biz> | 2013-04-17 16:22:01 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-04-17 16:22:01 -0700 |
| commit | 67cb1a2d4882c8f04728f828cc13de1a543a2bb3 (patch) | |
| tree | b3c2a6e4baaa8ccdee6aa3c36cdc8e8711b1fbb0 /FS/bin/freeside-queued | |
| parent | 5d2551a955964d8af6fec48ee85647567e942b0c (diff) | |
fix transaction state when exiting a queue job, #22524
Diffstat (limited to 'FS/bin/freeside-queued')
| -rw-r--r-- | FS/bin/freeside-queued | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued index 2fd80255e..dcc6ac4ba 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') ) { |