cmd/jujud: allow for a clean exit

upstart/upstart.go

 package upstart
 
 import (
         "bytes"
         "errors"
         "fmt"
         "io/ioutil"
         "os"
         "os/exec"
         "path/filepath"
@@ skipping 75 matching lines @@
 }
 
 // BUG: %q quoting does not necessarily match libnih quoting rules
 // (as used by upstart); this may become an issue in the future.
 var confT = template.Must(template.New("").Parse(`
 description "{{.Desc}}"
 author "Juju Team <juju@lists.ubuntu.com>"
 start on runlevel [2345]
 stop on runlevel [!2345]
 respawn
+normal exit 0
 {{range $k, $v := .Env}}env {{$k}}={{$v|printf "%q"}}
 {{end}}
 exec {{.Cmd}}{{if .Out}} >> {{.Out}} 2>&1{{end}}
 `[1:]))
 
 // Conf is responsible for defining and installing upstart services. Its fields
 // represent elements of an upstart service configuration file.
 type Conf struct {
         Service
         // Desc is the upstart service's description.
         Desc string
         // Env holds the environment variables that will be set when the command runs.
         Env map[string]string
         // Cmd is the command (with arguments) that will be run.
+        // The command will be restarted if it exits with a non-zero exit code.
         Cmd string
         // Out, if set, will redirect output to that path.
         Out string
 }
 
 // validate returns an error if the service is not adequately defined.
 func (c *Conf) validate() error {
         if c.Name == "" {
                 return errors.New("missing Name")
         }
@@ skipping 43 matching lines @@
 func (c *Conf) InstallCommands() ([]string, error) {
         conf, err := c.render()
         if err != nil {
                 return nil, err
         }
         return []string{
                 fmt.Sprintf("cat >> %s << 'EOF'\n%sEOF\n", c.confPath(), conf),
                 "start " + c.Name,
         }, nil
 }