[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r518: Provide proper status command to buildslave init script.

[Jeff Licquia]

------------------------------------------------------------
revno: 518
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-01-02 11:19:19 -0500
message:
  Provide proper status command to buildslave init script.
modified:
  modules/buildbot/manifests/slave.pp
  modules/buildbot/templates/buildslave.init.erb
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2013-12-03 01:29:25 +0000
+++ b/modules/buildbot/manifests/slave.pp	2014-01-02 16:19:19 +0000
@@ -345,8 +345,7 @@
     service { "buildslave":
         ensure     => running,
         hasrestart => false,
-        hasstatus  => false,
-        status     => 'ps -p $(cat /opt/buildbot/lsb-slave/twistd.pid)',
+        hasstatus  => true,
         require    => [ File['/etc/init.d/buildslave'], User['buildbot'],
                         Exec['make-slave'] ],
     }

=== modified file 'modules/buildbot/templates/buildslave.init.erb'
--- a/modules/buildbot/templates/buildslave.init.erb	2013-04-09 17:40:43 +0000
+++ b/modules/buildbot/templates/buildslave.init.erb	2014-01-02 16:19:19 +0000
@@ -14,6 +14,7 @@
 PRG=buildslave
 DAEMON=/opt/buildbot/bin/$PRG
 USER=buildbot
+PIDFILE=/opt/buildbot/lsb-slave/twistd.pid
 <% if scope.lookupvar("wordsize") == "small" then -%>
 SMALLWORDRUN=<%= smallwordcmd %>
 <% end -%>
@@ -36,6 +37,24 @@
     RETVAL=$?
     echo "done"
     ;;
+  status)
+    if [ -f $PIDFILE ]; then
+      if [ -d /proc/$(cat $PIDFILE) ]; then
+        echo "$PRG is running"
+        RETVAL=0
+      else
+        echo "$PRG is not running (stale PID file found)"
+        RETVAL=1
+      fi
+    else
+      echo "$PRG is not running"
+      RETVAL=3
+    fi
+    ;;
+  *)
+    echo "Usage: $0 start|stop|status"
+    RETVAL=1
+    ;;
 esac
 
 exit $RETVAL