From afc0fc9d4a88e65c4fcf0706895cbb688c701186 Mon Sep 17 00:00:00 2001
From: Josh Stompro <stomproj@larl.org>
Date: Tue, 19 Dec 2017 08:37:55 -0600
Subject: [PATCH] LP#1739044: fix lock file detection in eg-pbx-allocator.pl
Lock file detection wasn't working correctly. The
wrong operator was used to read the contents of the lock file.
Testing:
Running the eg-pbx-allocator.pl in the background multiple times will
trigger the lock file detection. Use -t to run in test mode to avoid
moving any files while testing.
/usr/local/bin/eg-pbx-allocator.pl -t -v -c /usr/local/etc/eg-pbx-daemon.conf &
/usr/local/bin/eg-pbx-allocator.pl -t -v -c /usr/local/etc/eg-pbx-daemon.conf
In syslog you can see entries that are missing the PID number when you test
before the fix is installed.
virt-asterisk1 eg-pbx-allocator.pl: lock file present (/tmp/eg-pbx-allocator-LOCK), still running
after the fix is installed, you will see the PID in the syslog entry.
virt-asterisk1 eg-pbx-allocator.pl: lock file present (/tmp/eg-pbx-allocator-LOCK), 21039 still running
Signed-off-by: Josh Stompro <stomproj@larl.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
Open-ILS/src/asterisk/pbx-daemon/eg-pbx-allocator.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Open-ILS/src/asterisk/pbx-daemon/eg-pbx-allocator.pl b/Open-ILS/src/asterisk/pbx-daemon/eg-pbx-allocator.pl
index 2db674f35a..ba583427f6 100755
--- a/Open-ILS/src/asterisk/pbx-daemon/eg-pbx-allocator.pl
+++ b/Open-ILS/src/asterisk/pbx-daemon/eg-pbx-allocator.pl
@@ -251,7 +251,7 @@ sub lock_file_release {
sub lock_file_test {
if (open FH, $config{lock_file}) {
- my $pid = <>;
+ my $pid = <FH>;
chomp $pid;
close FH;
--
2.11.0