Restart option in supervisor init script does not work

The attachment "Patch for the /etc/init.d/supervisor script" seems to be a patch. If it isn't, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are a member of the ~ubuntu-reviewers, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issues please contact him.]

Hi, Brian. Thanks for triaging my bug.

I see you have changed some things in my bug report. Apart from
tagging it with "patch", is there anything I could have done?

Thanks,

Javier

On Tue, Apr 9, 2013 at 12:58 AM, Brian Murray <email address hidden> wrote:
> ** Bug watch added: Debian Bug tracker #609457
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609457
>
> ** Also affects: supervisor (Debian) via
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609457
> Importance: Unknown
> Status: Unknown
>
> ** Changed in: supervisor (Ubuntu)
> Status: New => Triaged
>
> ** Changed in: supervisor (Ubuntu)
> Importance: Undecided => Medium
>
> --
> You received this bug notification because you are subscribed to the bug
> report.
> https://bugs.launchpad.net/bugs/1163753
>
> Title:
> Restart option in supervisor init script does not work
>
> Status in “supervisor” package in Ubuntu:
> Triaged
> Status in “supervisor” package in Debian:
> Unknown
>
> Bug description:
> Supervisord does not restart when invoked via `#
> /etc/init.d/supervisor restart` or `# service supervisor restart`
>
> Its PID stays the same. Manually stopping, then starting the package
> works, but management tools break if they depend on `restart`
> working.
>
> This is a documented bug from Debian, where the package originates and there is a patch available, although maintainer seems to be MIA:
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609457
>
> I copy from the Debian bug report:
>
> > The start-stop-daemon does not find running instances
> and so some conditionals in the script don't work.
>
> > Another side-effect is that the pidfile gets removed
> when invoking the script with "start" and supervisord is already running.
>
> I have applied the patch from the Debian bug report, and it works.
> Here's my own patch after applying and testing:
>
> diff --git a/supervisor b/supervisor
> index 334d4c6..05f28e1 100755
> --- a/supervisor
> +++ b/supervisor
> @@ -91,7 +91,7 @@ case "$1" in
> start)
> echo -n "Starting $DESC: "
> start-stop-daemon --start --quiet --pidfile $PIDFILE \
> - --exec $DAEMON -- $DAEMON_OPTS
> + --startas $DAEMON -- $DAEMON_OPTS
> test -f $PIDFILE || sleep 1
> if running ; then
> echo "$NAME."
> @@ -132,18 +132,17 @@ case "$1" in
> # just the same as "restart" except that it does nothing if the
> # daemon isn't already running.
> # check wether $DAEMON is running. If so, restart
> - start-stop-daemon --stop --test --quiet --pidfile \
> - /var/run/$NAME.pid --exec $DAEMON \
> + start-stop-daemon --stop --test --quiet --pidfile $PIDFILE\
> + --startas $DAEMON \
> && $0 restart \
> || exit 0
> ;;
> restart)
> echo -n "Restarting $DESC: "
> - start-stop-daemon --stop --quiet --pidfile \
> - /var/run/$NAME.pid --exec $DAEMON
> + start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
> [ -n "$DODTIME" ] && sleep $DODTIME
> - start-stop-daemon --sta...

latest patch backported from Debian sid confirmed a fix.
Please do a SRU, thanks.

Should be fixed with the sync of bug 1206474.