Layout package names refactored

[mfinanz.git] / SL / DB / BackgroundJob.pm

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index 18f8e428fabbd5ae665964b224dbbff895781d60..9f2f7cb05f6630b19e51ae9ce39aee7f8c45adfb 100644 (file)
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -10,9 +10,17 @@ use SL::DB::Manager::BackgroundJob;
 
 use SL::DB::BackgroundJobHistory;
 
-use SL::BackgroundJob::Test;
 use SL::System::Process;
 
+__PACKAGE__->before_save('_before_save_set_next_run_at');
+
+sub _before_save_set_next_run_at {
+  my ($self) = @_;
+
+  $self->update_next_run_at if !$self->next_run_at;
+  return 1;
+}
+
 sub update_next_run_at {
   my $self = shift;
 
@@ -29,6 +37,7 @@ sub run {
   my $history;
 
   my $ok = eval {
+    eval "require $package" or die $@;
     my $result = $package->new->run($self);
 
     $history = SL::DB::BackgroundJobHistory
@@ -81,7 +90,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.');