X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FBackgroundJob.pm;h=1fc8d992da858ee2d337e3b721015a44b85c97dd;hb=9dfd320ff258071e3ad78dd6cf2d76e215efd4f7;hp=18f8e428fabbd5ae665964b224dbbff895781d60;hpb=3be85e174a63158503c333e7f0682abfc969bf8b;p=kivitendo-erp.git

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index 18f8e428f..1fc8d992d 100644
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -5,13 +5,24 @@ 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;
+use SL::YAML;
+
+__PACKAGE__->meta->initialize;
+
+__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;
@@ -28,13 +39,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;
@@ -47,7 +61,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;
@@ -62,12 +76,26 @@ sub run {
 
 sub data_as_hash {
   my $self = shift;
+
+  $self->data(SL::YAML::Dump($_[0])) if @_;
+
   return {}                        if !$self->data;
   return $self->data               if ref($self->{data}) eq 'HASH';
-  return YAML::Load($self->{data}) if !ref($self->{data});
+  return SL::YAML::Load($self->{data}) if !ref($self->{data});
   return {};
 }
 
+sub set_data {
+  my ($self, %data) = @_;
+
+  $self->data(SL::YAML::Dump({
+    %{ $self->data_as_hash },
+    %data,
+  }));
+
+  $self;
+}
+
 sub validate {
   my ($self) = @_;
 
@@ -81,7 +109,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.');