X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Ftask_server.pl;h=3a45dd1b4c110a573c0921cfd2cad56f9063f655;hb=22462327b3b8379cc25117ebfd4597d07afd602a;hp=2c4a05fd45dcbdadffbdb9415850fa33bb3c7aa9;hpb=c3f94f18040a7905d4bf615684b6d51d85a959b1;p=kivitendo-erp.git

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 2c4a05fd4..3a45dd1b4 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -2,17 +2,20 @@
 
 use strict;
 
+my $exe_dir;
+
 BEGIN {
-  require Cwd;
+  use FindBin;
+  use lib "$FindBin::Bin/..";
 
-  my $dir =  $0;
-  $dir    =  Cwd::getcwd() . '/' . $dir unless $dir =~ m|^/|;
-  $dir    =~ s|[^/]+$|..|;
+  use SL::System::Process;
+  $exe_dir = SL::System::Process::exe_dir;
 
-  chdir($dir) || die "Cannot change directory to ${dir}\n";
+  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.
+  unshift @INC, $exe_dir;
 
-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  chdir($exe_dir) || die "Cannot change directory to ${exe_dir}\n";
 }
 
 use CGI qw( -no_xhtml);
@@ -21,6 +24,8 @@ 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;
 use SL::DB::BackgroundJob;
@@ -31,6 +36,7 @@ use SL::InstanceConfiguration;
 use SL::LXDebug;
 use SL::LxOfficeConf;
 use SL::Locale;
+use SL::System::TaskServer;
 
 our %lx_office_conf;
 
@@ -113,6 +119,8 @@ sub gd_run {
         $::locale = Locale->new($::lx_office_conf{system}->{language});
         $::form   = Form->new;
 
+        chdir $exe_dir;
+
         $job->run;
       }
 
@@ -125,19 +133,32 @@ sub gd_run {
     }
 
     my $seconds = 60 - (localtime)[0];
-    sleep($seconds < 30 ? $seconds + 60 : $seconds);
+    if (!eval {
+      local $SIG{'ALRM'} = sub {
+        $::lxdebug->message(0, "Got woken up by SIGALRM") if $lx_office_conf{task_server}->{debug};
+        die "Alarm!\n"
+      };
+      sleep($seconds < 30 ? $seconds + 60 : $seconds);
+      1;
+    }) {
+      die $@ unless $@ eq "Alarm!\n";
+    }
   }
 }
 
-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 = -f "${cwd}/config/lx_office.conf" ? "${cwd}/config/lx_office.conf" : "${cwd}/config/lx_office.conf.default";
 newdaemon(configfile => $file,
-          progname   => 'lx-office-task-server',
-          pidbase    => "${pidbase}/",
+          progname   => 'kivitendo-background-jobs',
+          pidbase    => SL::System::TaskServer::PID_BASE() . '/',
           );
 
 1;