Task-Server und -Control-Modul auf neue Konfigurationsdateinamen angepasst

diff --git a/SL/System/TaskServer.pm b/SL/System/TaskServer.pm
index bceb8f59803f7616e9b765d1b29438bbf50b6eb4..17be8edac86e5bfe4ddfeee4c269a8a3f61e631f 100644 (file)
--- a/SL/System/TaskServer.pm
+++ b/SL/System/TaskServer.pm
@@ -61,12 +61,14 @@ sub wake_up {
 sub _read_pid {
   my ($self) = @_;
 
 sub _read_pid {
   my ($self) = @_;
 

-  my $exe_dir       = SL::System::Process->exe_dir;
-  my $pid_file_name = join '.', splitdir($exe_dir), 'config.lx_office.conf.pid';
-  my $pid_file_path = catfile(catdir($exe_dir, 'users', 'pid'), $pid_file_name);
+  my $exe_dir = SL::System::Process->exe_dir;

 
 

-  return undef unless -f $pid_file_path;
-  return join('', read_file($pid_file_path)) * 1;
+  foreach my $conf (qw(kivitendo.conf lx_office.conf kivitendo.conf.default)) {
+    my $pid_file_name = join '.', splitdir($exe_dir), "config.${conf}.pid";
+    my $pid_file_path = catfile(catdir($exe_dir, 'users', 'pid'), $pid_file_name);
+
+    return join('', read_file($pid_file_path)) * 1 if -f $pid_file_path;
+  }

 }
 
 sub _run_script_command {
 }
 
 sub _run_script_command {

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index 8c17ca70a6de97e4ada01f0250681b05459f618e..d84e8115ba927ed16ea4bbf1f016869e138fb4bb 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -21,6 +21,7 @@ use Daemon::Generic;
 use Data::Dumper;
 use DateTime;
 use English qw(-no_match_vars);
 use Data::Dumper;
 use DateTime;
 use English qw(-no_match_vars);

+use List::Util qw(first);

 use POSIX qw(setuid setgid);
 use SL::Auth;
 use SL::DB::BackgroundJob;
 use POSIX qw(setuid setgid);
 use SL::Auth;
 use SL::DB::BackgroundJob;


@@ -143,7 +144,7 @@ my $pidbase = "${cwd}/users/pid";
 
 mkdir($pidbase) if !-d $pidbase;
 
 
 mkdir($pidbase) if !-d $pidbase;
 

-my $file = -f "${cwd}/config/lx_office.conf" ? "${cwd}/config/lx_office.conf" : "${cwd}/config/lx_office.conf.default";
+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}/",
 newdaemon(configfile => $file,
           progname   => 'kivitendo-task-server',
           pidbase    => "${pidbase}/",