percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ON_EXIT.

Browse Source
This commit is contained in:
Daniel Nichter
2011-12-07 10:48:47 -07:00
parent 578896c217
commit c486bf8461
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bash/daemon.sh
View File

@@ -29,9 +29,6 @@ set -u
# Arguments: # Arguments:
# file - File to write PID to. # file - File to write PID to.
# pid - PID to write into file. # pid - PID to write into file.
#
# Required Global Variables:
# ON_EXIT - String to append "remove_pid_file file".
make_pid_file() { make_pid_file() {
local file=$1 local file=$1
local pid=$2 local pid=$2
@@ -60,7 +57,6 @@ make_pid_file() {
# PID file doesn't exist, or it does but its pid is stale. # PID file doesn't exist, or it does but its pid is stale.
echo "$pid" > $file echo "$pid" > $file
ON_EXIT="$ON_EXIT; remove_pid_file $file"
} }
remove_pid_file() { remove_pid_file() {

9
t/lib/bash/daemon.sh
View File

@@ -1,9 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
TESTS=8 TESTS=7
TMPDIR="$TEST_TMPDIR" TMPDIR="$TEST_TMPDIR"
ON_EXIT=":"
local file="$TMPDIR/pid-file" local file="$TMPDIR/pid-file"
source "$LIB_DIR/log_warn_die.sh" source "$LIB_DIR/log_warn_die.sh"
@@ -31,15 +30,9 @@ cmd_ok \
"test ! -f $file" \ "test ! -f $file" \
"PID file removed" "PID file removed"
is \
"$ON_EXIT" \
":; remove_pid_file $file" \
"Sets ON_EXIT to remove PID file"
# ########################################################################### # ###########################################################################
# PID file already exists and proc is running. # PID file already exists and proc is running.
# ########################################################################### # ###########################################################################
ON_EXIT=""
echo $$ > $file echo $$ > $file
( (