[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 06f53412cdceedb7f61f3fa31fbc849676c352d6

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_1 has been updated
       via  06f53412cdceedb7f61f3fa31fbc849676c352d6 (commit)
      from  5b56f6242f641b225b011ad25c57b2f63d3749c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06f53412cdceedb7f61f3fa31fbc849676c352d6
Author: Josh Stompro <stomproj at larl.org>
Date:   Tue Dec 19 08:37:55 2017 -0600

    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 at larl.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 2db674f..ba58342 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;
 

-----------------------------------------------------------------------

Summary of changes:
 .../src/asterisk/pbx-daemon/eg-pbx-allocator.pl    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS