X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FBackgroundJob.pm;h=743a6b5eac5dd55f4f9724abbeecd03d5be0845e;hb=debd14edcc23a6168e827be861a052f396aee901;hp=f4edf2d30b8b843b71f7a8bff5e85c1905620ee2;hpb=782fd7884fb686cd2e336756dadeb4ab5d05a415;p=kivitendo-erp.git

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index f4edf2d30..743a6b5ea 100644
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -3,16 +3,68 @@ package SL::DB::BackgroundJob;
 use strict;
 
 use DateTime::Event::Cron;
+use English qw(-no_match_vars);
 
 use SL::DB::MetaSetup::BackgroundJob;
 use SL::DB::Manager::BackgroundJob;
 
+use SL::DB::BackgroundJobHistory;
+
+use SL::BackgroundJob::Test;
+
 sub update_next_run_at {
   my $self = shift;
 
   my $cron = DateTime::Event::Cron->new_from_cron($self->cron_spec || '* * * * *');
-  $self->update_attributes(next_run_at => $cron->next->set_time_zone($::locale->get_local_time_zone));
+  $self->update_attributes(next_run_at => $cron->next(DateTime->now_local));
   return $self;
 }
 
+sub run {
+  my $self = shift;
+
+  my $package = "SL::BackgroundJob::" . $self->package_name;
+  my $run_at  = DateTime->now_local;
+  my $history;
+
+  my $ok = eval {
+    my $result = $package->new->run($self);
+
+    $history = SL::DB::BackgroundJobHistory
+      ->new(package_name => $self->package_name,
+            run_at       => $run_at,
+            status       => 'success',
+            result       => $result,
+            data         => $self->data);
+    $history->save;
+
+    1;
+  };
+
+  if (!$ok) {
+    my $error = $EVAL_ERROR;
+    $history = SL::DB::BackgroundJobHistory
+      ->new(package_name => $self->package_name,
+            run_at       => $run_at,
+            status       => 'failure',
+            error_col    => $error,
+            data         => $self->data);
+    $history->save;
+
+    $::lxdebug->message(LXDebug->WARN(), "BackgroundJob ID " . $self->id . " execution error (first three lines): " . join("\n", (split(m/\n/, $error))[0..2]));
+  }
+
+  $self->assign_attributes(last_run_at => $run_at)->update_next_run_at;
+
+  return $history;
+}
+
+sub data_as_hash {
+  my $self = shift;
+  return {}                        if !$self->data;
+  return $self->data               if ref($self->{data}) eq 'HASH';
+  return YAML::Load($self->{data}) if !ref($self->{data});
+  return {};
+}
+
 1;