X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=scripts%2Ftask_server.pl;h=eb407cb35543c6e6973cf3f0857506a2d17034a9;hb=d1564e8aa44f920d0c9ddf08141417f0deb89ba6;hp=2ad2f2d85834929cfb510e9e3030e32b142299f1;hpb=4ab40559b5e3f076b02f75cc69ca9bcd7e59ed73;p=kivitendo-erp.git

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 2ad2f2d85..eb407cb35 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -2,9 +2,11 @@
 
 use strict;
 
+my $exe_dir;
+
 BEGIN {
   use SL::System::Process;
-  my $exe_dir = SL::System::Process::exe_dir;
+  $exe_dir = SL::System::Process::exe_dir;
 
   unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
   push    @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
@@ -19,6 +21,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;
@@ -30,6 +33,7 @@ use SL::InstanceConfiguration;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
+use SL::System::TaskServer;
 
 our %lx_office_conf;
 
@@ -112,6 +116,8 @@ sub gd_run {
         $::locale = Locale->new($::lx_office_conf{system}->{language});
         $::form   = Form->new;
 
+        chdir $exe_dir;
+
         $job->run;
       }
 
@@ -137,15 +143,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}/",
+          pidbase    => SL::System::TaskServer::PID_BASE() . '/',
           );
 
 1;