From e0074e87d499e301a7099d0a67bd8d0f20b2c447 Mon Sep 17 00:00:00 2001 From: dbs Date: Thu, 11 Nov 2010 14:25:02 +0000 Subject: [PATCH] Use the same PID directory as the opensrf-perl.pl and opensrf.py scripts The default PID directories for the opensrf-perl.pl and opensrf.py scripts was /openils/var/run/opensrf (assuming a prefix of '/openils'), while the default PID directory for osrf_ctl.sh was /openils/var/run. This complicated matters when trying to restart individual Python or Perl services, as without passing an explicit PID directory argument the restart command from the language-specific script would check for a PID in a different PID directory, find none, and end up running a second copy of the service instead of restarting the existing service. The change groups all PIDs in the 'run/opensrf' subdirectory to avoid any PID file conflicts (as unlikely as that might be) if OpenSRF is installed in the default location - so rather than /var/local/run/*.pid, one will be able to look at /var/local/run/opensrf/*.pid git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@2075 9efc2488-bf62-4759-914b-345cdb29e865 --- bin/osrf_ctl.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/osrf_ctl.sh.in b/bin/osrf_ctl.sh.in index a59afb1..d6c5483 100755 --- a/bin/osrf_ctl.sh.in +++ b/bin/osrf_ctl.sh.in @@ -89,7 +89,7 @@ if [ ! -r "$OPT_CONFIG" ]; then echo "Please specify the location of the opensrf_core.xml file using the -c flag"; exit 1; fi; -[ -z "$OPT_PID_DIR" ] && OPT_PID_DIR=`$OSRF_CONFIG --localstatedir`/run; +[ -z "$OPT_PID_DIR" ] && OPT_PID_DIR=`$OSRF_CONFIG --localstatedir`/run/opensrf; [ -z "$OPT_ACTION" ] && usage; PID_ROUTER="$OPT_PID_DIR/router.pid"; -- 2.11.0