Merge branch 'release-2.3.3' into release-2.3.4

Conflicts: project/Build.scala
olivererwang · Sep 20, 2012 · ea9d4da · ea9d4da
2 parents 8c95afc + f3a47af
commit ea9d4da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -15,7 +15,7 @@ object Kestrel extends Build {
  ).settings(
  name := "kestrel",
  organization := "net.lag",
- version := "2.3.3-SNAPSHOT",
+ version := "2.3.4-SNAPSHOT",
  scalaVersion := "2.9.1",
 
  // time-based tests cannot be run in parallel

diff --git a/src/scripts/kestrel.sh b/src/scripts/kestrel.sh
@@ -113,8 +113,8 @@ case "$1" in
  tries=$((tries + 1))
  if [ $tries -ge 15 ]; then
  echo "FAILED SOFT SHUTDOWN, TRYING HARDER"
- if [ -f $pidfile ]; then
- kill $(cat $pidfile)
+ if [ -f $daemon_pidfile ]; then
+ kill $(cat $daemon_pidfile)
  else
  echo "CAN'T FIND PID, TRY KILL MANUALLY"
  exit 1
@@ -124,7 +124,7 @@ case "$1" in
  hardtries=$((hardtries + 1))
  if [ $hardtries -ge 5 ]; then
  echo "FAILED HARD SHUTDOWN, TRY KILL -9 MANUALLY"
- kill -9 $(cat $pidfile)
+ kill -9 $(cat $daemon_pidfile)
  fi
  sleep 1
  done