Jelajahi Sumber

Merge pull request #2552 from OriHoch/celerybeat-generic-init-script-fails-on-ubuntu-1404-LTS

celerybeat daemon restart fails on ubuntu 14.04 LTS
PMickael 10 tahun lalu
induk
melakukan
eec22ea841
1 mengubah file dengan 5 tambahan dan 2 penghapusan
  1. 5 2
      extra/generic-init.d/celerybeat

+ 5 - 2
extra/generic-init.d/celerybeat

@@ -202,14 +202,17 @@ create_paths () {
     create_default_dir "$CELERYBEAT_PID_DIR"
     create_default_dir "$CELERYBEAT_PID_DIR"
 }
 }
 
 
+is_running() {
+    pid=$1
+    ps $pid > /dev/null 2>&1
+}
 
 
 wait_pid () {
 wait_pid () {
     pid=$1
     pid=$1
     forever=1
     forever=1
     i=0
     i=0
     while [ $forever -gt 0 ]; do
     while [ $forever -gt 0 ]; do
-        kill -0 $pid 1>/dev/null 2>&1
-        if [ $? -eq 1 ]; then
+        if ! is_running $pid; then
             echo "OK"
             echo "OK"
             forever=0
             forever=0
         else
         else