X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=scripts%2Ftask_server.pl;h=3a45dd1b4c110a573c0921cfd2cad56f9063f655;hb=5ca497d53b8c09d4598fd73a5e73a032cf6731df;hp=513fa98a1dc9f38ebda01556e039c53ab77b0835;hpb=22e5a8bb243f6d390940450d2ea21d2ff47cfadc;p=kivitendo-erp.git

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 513fa98a1..3a45dd1b4 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;
 
@@ -21,6 +24,7 @@ use Daemon::Generic;
 use Data::Dumper;
 use DateTime;
 use English qw(-no_match_vars);
+use File::Spec;
 use List::Util qw(first);
 use POSIX qw(setuid setgid);
 use SL::Auth;
@@ -32,6 +36,7 @@ use SL::InstanceConfiguration;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
+use SL::System::TaskServer;
 
 our %lx_office_conf;
 
@@ -141,15 +146,19 @@ sub gd_run {
   }
 }
 
-my $cwd     = getcwd();
-my $pidbase = "${cwd}/users/pid";
+chdir $exe_dir;
+
+mkdir SL::System::TaskServer::PID_BASE() if !-d SL::System::TaskServer::PID_BASE();
+
+my $file = first { -f } ("${exe_dir}/config/kivitendo.conf", "${exe_dir}/config/lx_office.conf", "${exe_dir}/config/kivitendo.conf.default");
+
+die "No configuration file found." unless $file;
 
-mkdir($pidbase) if !-d $pidbase;
+$file = File::Spec->abs2rel(Cwd::abs_path($file), Cwd::abs_path($exe_dir));
 
-my $file = first { -f } ("${cwd}/config/kivitendo.conf", "${cwd}/config/lx_office.conf", "${cwd}/config/kivitendo.conf.default");
 newdaemon(configfile => $file,
-          progname   => 'kivitendo-task-server',
-          pidbase    => "${pidbase}/",
+          progname   => 'kivitendo-background-jobs',
+          pidbase    => SL::System::TaskServer::PID_BASE() . '/',
           );
 
 1;