Merge tag 'kivitendo_3.5.4-2' into b-3.5.6.1

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

diff --git a/SL/DB/Manager/BackgroundJob.pm b/SL/DB/Manager/BackgroundJob.pm
index 1429a7856e00dd5d0c15072ea3fb79a1e3925fa3..8b2e99aa8f1c965a4d45315e7a25d2e062fe0dc4 100644 (file)
--- a/SL/DB/Manager/BackgroundJob.pm
+++ b/SL/DB/Manager/BackgroundJob.pm
@@ -5,10 +5,20 @@ use strict;
 use SL::DB::Helper::Manager;
 use base qw(SL::DB::Helper::Manager);
 
 use SL::DB::Helper::Manager;
 use base qw(SL::DB::Helper::Manager);
 

+use SL::DB::Helper::Paginated;
+use SL::DB::Helper::Sorted;
+
+use SL::System::TaskServer;
+

 sub object_class { 'SL::DB::BackgroundJob' }
 
 __PACKAGE__->make_manager_methods;
 
 sub object_class { 'SL::DB::BackgroundJob' }
 
 __PACKAGE__->make_manager_methods;
 

+sub _sort_spec {
+  return ( default => [ 'next_run_at', 1 ],
+           columns => { SIMPLE => 'ALL' } );
+}
+

 sub cleanup {
   my $class = shift;
   $class->delete_all(where => [ and => [ type => 'once', last_run_at => { lt => DateTime->now_local->subtract(days => '1') } ] ]);
 sub cleanup {
   my $class = shift;
   $class->delete_all(where => [ and => [ type => 'once', last_run_at => { lt => DateTime->now_local->subtract(days => '1') } ] ]);


@@ -28,8 +38,21 @@ sub get_all_need_to_run {
                                                  cron_spec   => '',
                                                  next_run_at => undef,
                                                  next_run_at => { le => $now } ] ]);
                                                  cron_spec   => '',
                                                  next_run_at => undef,
                                                  next_run_at => { le => $now } ] ]);

-
-  return $class->get_all(where => [ or => [ @interval_args, @once_args ] ]);
+  my @node_filter;
+
+  my $node_id = SL::System::TaskServer->node_id;
+  if ($::lx_office_conf{task_server}->{only_run_tasks_for_this_node}) {
+    @node_filter = (node_id => $node_id);
+  } else {
+    @node_filter = (
+      or => [
+        node_id => undef,
+        node_id => '',
+        node_id => $node_id,
+      ]);
+  }
+
+  return $class->get_all(query => [ or => [ @interval_args, @once_args ], @node_filter ]);

 }
 
 1;
 }
 
 1;