X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Ftask_server.pl;h=81d2078c83bcda4215736af0f9a4920cf2375877;hb=f26083d9a08116e4d2a72f975f3bc2b81955dcea;hp=eb407cb35543c6e6973cf3f0857506a2d17034a9;hpb=f866d16b4e837443b71ffaf3b78c1127ac57717e;p=kivitendo-erp.git

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index eb407cb35..81d2078c8 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -5,6 +5,9 @@ use strict;
 my $exe_dir;
 
 BEGIN {
+  use FindBin;
+  use lib "$FindBin::Bin/..";
+
   use SL::System::Process;
   $exe_dir = SL::System::Process::exe_dir;
 
@@ -37,8 +40,14 @@ use SL::System::TaskServer;
 
 our %lx_office_conf;
 
+sub debug {
+  return if !$lx_office_conf{task_server}->{debug};
+  $::lxdebug->message(0, @_);
+}
+
 sub lxinit {
-  my $login = $lx_office_conf{task_server}->{login};
+  my $login  = $lx_office_conf{task_server}->{login};
+  my $client = $lx_office_conf{task_server}->{client};
 
   package main;
 
@@ -46,6 +55,7 @@ sub lxinit {
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::auth          = SL::Auth->new;
+  die "No client configured or no client found with the name/ID '$client'" unless $::auth->set_client($client);
   $::instance_conf = SL::InstanceConfiguration->new;
   $::request       = { cgi => CGI->new({}) };
 
@@ -92,8 +102,9 @@ sub gd_preconfig {
 
   SL::LxOfficeConf->read($self->{configfile});
 
-  die "Missing section [task_server] in config file"                unless $lx_office_conf{task_server};
-  die "Missing key 'login' in section [task_server] in config file" unless $lx_office_conf{task_server}->{login};
+  die "Missing section [task_server] in config file"                 unless $lx_office_conf{task_server};
+  die "Missing key 'login' in section [task_server] in config file"  unless $lx_office_conf{task_server}->{login};
+  die "Missing key 'client' in section [task_server] in config file" unless $lx_office_conf{task_server}->{client};
 
   drop_privileges();
   lxinit();
@@ -104,11 +115,11 @@ sub gd_preconfig {
 sub gd_run {
   while (1) {
     my $ok = eval {
-      $::lxdebug->message(0, "Retrieving jobs") if $lx_office_conf{task_server}->{debug};
+      debug("Retrieving jobs");
 
       my $jobs = SL::DB::Manager::BackgroundJob->get_all_need_to_run;
 
-      $::lxdebug->message(0, "  Found: " . join(' ', map { $_->package_name } @{ $jobs })) if $lx_office_conf{task_server}->{debug} && @{ $jobs };
+      debug("  Found: " . join(' ', map { $_->package_name } @{ $jobs })) if @{ $jobs };
 
       foreach my $job (@{ $jobs }) {
         # Provide fresh global variables in case legacy code modifies
@@ -124,15 +135,13 @@ sub gd_run {
       1;
     };
 
-    if ($lx_office_conf{task_server}->{debug}) {
-      $::lxdebug->message(0, "Exception during execution: ${EVAL_ERROR}") if !$ok;
-      $::lxdebug->message(0, "Sleeping");
-    }
+    debug("Exception during execution: ${EVAL_ERROR}") if !$ok;
+    debug("Sleeping");
 
     my $seconds = 60 - (localtime)[0];
     if (!eval {
       local $SIG{'ALRM'} = sub {
-        $::lxdebug->message(0, "Got woken up by SIGALRM") if $lx_office_conf{task_server}->{debug};
+        debug("Got woken up by SIGALRM");
         die "Alarm!\n"
       };
       sleep($seconds < 30 ? $seconds + 60 : $seconds);
@@ -154,7 +163,7 @@ die "No configuration file found." unless $file;
 $file = File::Spec->abs2rel(Cwd::abs_path($file), Cwd::abs_path($exe_dir));
 
 newdaemon(configfile => $file,
-          progname   => 'kivitendo-task-server',
+          progname   => 'kivitendo-background-jobs',
           pidbase    => SL::System::TaskServer::PID_BASE() . '/',
           );