Skip to content

debian/scripts/tarantool_instance : do not override PID file location #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CameronNemo wants to merge 1 commit into from
Closed

debian/scripts/tarantool_instance : do not override PID file location #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions debian/scripts/tarantool_instance
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ CFG=$1
ACTION=$2
CONFIG_DIR=/var/lib/tarantool/started
SNAPSHOT_DIR=/var/lib/tarantool/snapshot
PID_DIR=/var/run/tarantool
LOG_DIR=/var/log/tarantool
BOX=/usr/bin/tarantool
SSD=start-stop-daemon
Expand Down Expand Up @@ -53,9 +52,9 @@ fi

NAME=`basename $CFG .cfg`

PID=$PID_DIR/$NAME.pid
SCFG=$CONFIG_DIR/$NAME
RUNDIR=$SNAPSHOT_DIR/$NAME
PID=$RUNDIR/tarantool.pid
LOG=$LOG_DIR/$NAME.log
LOGGER="exec /usr/lib/tarantool/logger $LOG"
SOCKETS=`grep \
Expand All @@ -68,10 +67,6 @@ if test -z $SOCKETS; then
SOCKETS=1023
fi

if ! test -x $PID_DIR; then
install -otarantool -gtarantool -d -m0750 $PID_DIR
fi

SSDARGS_NO_PID="--quiet --chdir $RUNDIR --chuid tarantool --exec"
SSDARGS="--pidfile $PID $SSDARGS_NO_PID"

Expand All @@ -84,7 +79,6 @@ ulimit -c unlimited
comment_str="#### - commented by init script"
sed "s/^[[:space:]]*file_descriptors.*/# & $comment_str/" $CFG > $SCFG

echo "pid_file = $PID" >> $SCFG
echo "logger = \"$LOGGER\"" >> $SCFG
grep '^[[:space:]]*admin_port[[:space:]]*=' $CFG |tail -n 1 >> $SCFG
grep '^[[:space:]]*primary_port[[:space:]]*=' $CFG |tail -n 1 >> $SCFG
Expand Down