foreman-capistrano 0.52.1 → 0.52.2

data/data/export/monit/wrapper.sh.erb

@@ -42,13 +42,14 @@ function stop() {
         read pid < $PID_FILE
         if checkpid $pid 2>&1; then
             kill -TERM $pid
-            if [ $? -eq 0 ]; then
+            sleep 1
+            if checkpid $pid 2>&1; then
+                echo "[FAILED TO STOP. TERMINATING]"
+                kill -KILL $pid
+            else
                 echo $! > $PID_FILE
                 echo "[OK]"
                 rm -rf $PID_FILE
-            else
-                echo "[FAIL]"
-                exit $STATUS_UNKNOWN
             fi
         else
             echo "[FAIL] process with PID ${pid} does not exist"

data/lib/foreman/engine.rb

@@ -154,7 +154,7 @@ class Foreman::Engine
   # @returns [String]  The root directory
   #
   def root
-    File.expand_path(options[:root] || Dir.pwd)
+    File.expand_path(options[:root] || `pwd -L`.strip)
   end
 
   # Get the port for a given process and offset

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.52.1"
+  VERSION = "0.52.2"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.52.2
   prerelease: 
 platform: ruby
 authors: