Bei foreign keys auch die ::AUTO:: namespaces löschen

[mfinanz.git] / scripts / task_server.pl

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index eb407cb35543c6e6973cf3f0857506a2d17034a9..c8ad935f04f509438aa9edb339634471f7056362 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -5,6 +5,9 @@ use strict;
 my $exe_dir;
 
 BEGIN {
 my $exe_dir;
 
 BEGIN {

+  use FindBin;
+  use lib "$FindBin::Bin/..";
+

   use SL::System::Process;
   $exe_dir = SL::System::Process::exe_dir;
 
   use SL::System::Process;
   $exe_dir = SL::System::Process::exe_dir;
 


@@ -38,7 +41,8 @@ use SL::System::TaskServer;
 our %lx_office_conf;
 
 sub lxinit {
 our %lx_office_conf;
 
 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;
 
 
   package main;
 


@@ -46,6 +50,7 @@ sub lxinit {
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
   $::auth          = SL::Auth->new;
   $::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({}) };
 
   $::instance_conf = SL::InstanceConfiguration->new;
   $::request       = { cgi => CGI->new({}) };
 


@@ -92,8 +97,9 @@ sub gd_preconfig {
 
   SL::LxOfficeConf->read($self->{configfile});
 
 
   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();
 
   drop_privileges();
   lxinit();


@@ -154,7 +160,7 @@ die "No configuration file found." unless $file;
 $file = File::Spec->abs2rel(Cwd::abs_path($file), Cwd::abs_path($exe_dir));
 
 newdaemon(configfile => $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() . '/',
           );
 
           pidbase    => SL::System::TaskServer::PID_BASE() . '/',
           );