Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / SL / DB / BackgroundJob.pm

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index ce1c399..10e319b 100644 (file)
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -5,14 +5,15 @@ use strict;
 use DateTime::Event::Cron;
 use English qw(-no_match_vars);
 
+use Rose::DB::Object::Helpers qw(as_tree);
+
 use SL::DB::MetaSetup::BackgroundJob;
 use SL::DB::Manager::BackgroundJob;
 
-use SL::DB::BackgroundJobHistory;
-
-use SL::BackgroundJob::Test;
 use SL::System::Process;
 
+__PACKAGE__->meta->initialize;
+
 __PACKAGE__->before_save('_before_save_set_next_run_at');
 
 sub _before_save_set_next_run_at {
@@ -37,13 +38,16 @@ sub run {
   my $run_at  = DateTime->now_local;
   my $history;
 
+  require SL::DB::BackgroundJobHistory;
+
   my $ok = eval {
+    eval "require $package" or die $@;
     my $result = $package->new->run($self);
 
     $history = SL::DB::BackgroundJobHistory
       ->new(package_name => $self->package_name,
             run_at       => $run_at,
-            status       => 'success',
+            status       => SL::DB::BackgroundJobHistory::SUCCESS(),
             result       => $result,
             data         => $self->data);
     $history->save;
@@ -56,7 +60,7 @@ sub run {
     $history = SL::DB::BackgroundJobHistory
       ->new(package_name => $self->package_name,
             run_at       => $run_at,
-            status       => 'failure',
+            status       => SL::DB::BackgroundJobHistory::FAILURE(),
             error_col    => $error,
             data         => $self->data);
     $history->save;
@@ -77,6 +81,16 @@ sub data_as_hash {
   return {};
 }
 
+sub set_data {
+  my ($self, %data) = @_;
+
+  my $data = YAML::Load($self->data);
+  $data->{$_} = $data{$_} for keys %data;
+  $self->data(YAML::Dump($data));
+
+  $self;
+}
+
 sub validate {
   my ($self) = @_;
 
@@ -90,7 +104,7 @@ sub validate {
   }
 
   eval {
-    DateTime::Event::Cron->new_from_cron($self->cron_spec)->next(DateTime->now_local);
+    DateTime::Event::Cron->new_from_cron($self->cron_spec || '* * * * *')->next(DateTime->now_local);
     1;
   } or push @errors, $::locale->text('The execution schedule is invalid.');