Skip to content

Commit

Permalink
mrgw: search for cmake build dir.
Browse files Browse the repository at this point in the history
Similar to mstart and mstop, mrgw also needs to find the correct build
dir as we pass in the pidfile and asokfile which otherwise falls back to
src/run dir.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
  • Loading branch information
theanalyst committed Jul 7, 2016
1 parent 8a1fa02 commit eeb394e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/mrgw.sh
Expand Up @@ -3,6 +3,14 @@
set -e

script_root=`dirname $0`
script_root=`(cd $script_root;pwd)`
if [ -e CMakeCache.txt ]; then
script_root=$PWD
elif [ -e $root_path/../build/CMakeCache.txt ]; then
cd $root_path/../build
script_root=$PWD
fi
vstart_path=`dirname $0`

[ "$#" -lt 2 ] && echo "usage: $0 <name> <port> [params...]" && exit 1

Expand All @@ -16,6 +24,6 @@ pidfile=$run_root/out/radosgw.${port}.pid
asokfile=$run_root/out/radosgw.${port}.asok
logfile=$run_root/out/radosgw.${port}.log

$script_root/mstop.sh $name radosgw $port
$vstart_path/mstop.sh $name radosgw $port

$script_root/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile
$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile

0 comments on commit eeb394e

Please sign in to comment.