projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
System
/
TaskServer.pm
diff --git
a/SL/System/TaskServer.pm
b/SL/System/TaskServer.pm
index
df67523
..
57d0ba8
100644
(file)
--- a/
SL/System/TaskServer.pm
+++ b/
SL/System/TaskServer.pm
@@
-20,6
+20,8
@@
use constant {
ERR_PROCESS => -2,
};
ERR_PROCESS => -2,
};
+use constant PID_BASE => "users/pid";
+
sub status {
my ($self) = @_;
sub status {
my ($self) = @_;
@@
-65,8
+67,7
@@
sub _read_pid {
my $exe_dir = SL::System::Process->exe_dir;
foreach my $conf (qw(kivitendo.conf lx_office.conf kivitendo.conf.default)) {
my $exe_dir = SL::System::Process->exe_dir;
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);
+ my $pid_file_path = catfile(catdir($exe_dir, splitdir(PID_BASE())), "config.${conf}.pid");
return join('', read_file($pid_file_path)) * 1 if -f $pid_file_path;
}
return join('', read_file($pid_file_path)) * 1 if -f $pid_file_path;
}