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

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index c83868502..1fc8d992d 100644
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -5,12 +5,15 @@ use strict;
 use DateTime::Event::Cron;
 use English qw(-no_match_vars);
 
-require SL::DB::MetaSetup::BackgroundJob;
-require SL::DB::Manager::BackgroundJob;
+use Rose::DB::Object::Helpers qw(as_tree);
 
-require SL::DB::BackgroundJobHistory;
+use SL::DB::MetaSetup::BackgroundJob;
+use SL::DB::Manager::BackgroundJob;
 
 use SL::System::Process;
+use SL::YAML;
+
+__PACKAGE__->meta->initialize;
 
 __PACKAGE__->before_save('_before_save_set_next_run_at');
 
@@ -36,6 +39,8 @@ 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);
@@ -43,7 +48,7 @@ sub run {
     $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 +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;
@@ -71,18 +76,22 @@ 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) = @_;
 
-  my $data = YAML::Load($self->data);
-  $data->{$_} = $data{$_} for keys %data;
-  $self->data(YAML::Dump($data));
+  $self->data(SL::YAML::Dump({
+    %{ $self->data_as_hash },
+    %data,
+  }));
 
   $self;
 }