[OpenSRF-GIT] OpenSRF branch master updated. cb56fd32eb43f037c4126e1398b0e9cd546d9f19

[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 "OpenSRF".

The branch, master has been updated
       via  cb56fd32eb43f037c4126e1398b0e9cd546d9f19 (commit)
      from  65ce998b02d0778541b3101379013448cba606d2 (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 cb56fd32eb43f037c4126e1398b0e9cd546d9f19
Author: Mike Rylander <mrylander at gmail.com>
Date:   Fri Jun 20 16:48:51 2014 -0400

    LP#1337401: Only care about our own processes
    
    OpenSRF can run mutiple times, as different users, on one host.
    Right now we look for all service processes, but we should only
    look for our own. This patch does that.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/bin/opensrf-perl.pl.in b/bin/opensrf-perl.pl.in
index e98eed6..e1c7efc 100755
--- a/bin/opensrf-perl.pl.in
+++ b/bin/opensrf-perl.pl.in
@@ -211,8 +211,8 @@ sub get_service_pids_from_ps {
     my $service = shift;
 
     my $ps = ($service eq 'router') ?
-        "ps ax | grep 'OpenSRF Router'" :
-        "ps ax | grep 'OpenSRF Listener \\[$service\\]'";
+        "ps x | grep 'OpenSRF Router'" :
+        "ps x | grep 'OpenSRF Listener \\[$service\\]'";
 
     $ps .= " | grep -v grep |  sed 's/^\\s*//' | cut -d' ' -f1";
     my @pids = `$ps`;
@@ -492,9 +492,9 @@ sub get_running_pids {
 
     # start with the listeners, then drones, then routers
     my @greps = (
-        "ps ax | grep 'OpenSRF Listener' ",
-        "ps ax | grep 'OpenSRF Drone' ",
-        "ps ax | grep 'OpenSRF Router' "
+        "ps x | grep 'OpenSRF Listener' ",
+        "ps x | grep 'OpenSRF Drone' ",
+        "ps x | grep 'OpenSRF Router' "
     );
 
     $_ .= "| grep -v grep |  sed 's/^\\s*//' | cut -d' ' -f1" for @greps;

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

Summary of changes:
 bin/opensrf-perl.pl.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
OpenSRF