OrgGo
/
service-tools
mirror of https://github.com/muesli/service-tools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Time values can also be time spans in string format

This commit is contained in:
Christian Muehlhaeuser 2018-03-13 04:14:07 +01:00
parent 59219a33b5
commit cd038191f6
No known key found for this signature in database
GPG Key ID: BA4CF857DD4117E9
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
createcmd.go
View File

@ -5,7 +5,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strconv"
"strings" "strings"
"github.com/coreos/go-systemd/unit" "github.com/coreos/go-systemd/unit"
@ -30,9 +29,9 @@ type CreateOptions struct {
Group string Group string
Restart string Restart string
RestartSec uint64 RestartSec string
TimeoutStartSec uint64 TimeoutStartSec string
TimeoutStopSec uint64 TimeoutStopSec string
After string After string
WantedBy string WantedBy string
@ -183,9 +182,9 @@ func executeCreate() error {
&unit.UnitOption{"Service", "User", createOpts.User}, &unit.UnitOption{"Service", "User", createOpts.User},
&unit.UnitOption{"Service", "Group", createOpts.Group}, &unit.UnitOption{"Service", "Group", createOpts.Group},
&unit.UnitOption{"Service", "Restart", createOpts.Restart}, &unit.UnitOption{"Service", "Restart", createOpts.Restart},
&unit.UnitOption{"Service", "RestartSec", strconv.FormatUint(createOpts.RestartSec, 10)}, &unit.UnitOption{"Service", "RestartSec", createOpts.RestartSec},
&unit.UnitOption{"Service", "TimeoutStartSec", strconv.FormatUint(createOpts.TimeoutStartSec, 10)}, &unit.UnitOption{"Service", "TimeoutStartSec", createOpts.TimeoutStartSec},
&unit.UnitOption{"Service", "TimeoutStopSec", strconv.FormatUint(createOpts.TimeoutStopSec, 10)}, &unit.UnitOption{"Service", "TimeoutStopSec", createOpts.TimeoutStopSec},
&unit.UnitOption{"Install", "WantedBy", createOpts.WantedBy}, &unit.UnitOption{"Install", "WantedBy", createOpts.WantedBy},
} }
@ -227,9 +226,9 @@ func init() {
createCmd.PersistentFlags().StringVarP(&createOpts.Group, "group", "g", "root", "Group to run service as") createCmd.PersistentFlags().StringVarP(&createOpts.Group, "group", "g", "root", "Group to run service as")
createCmd.PersistentFlags().StringVarP(&createOpts.Restart, "restart", "r", "on-failure", "When to restart (no, always, on-success, on-failure, on-abnormal, on-abort or on-watchdog)") createCmd.PersistentFlags().StringVarP(&createOpts.Restart, "restart", "r", "on-failure", "When to restart (no, always, on-success, on-failure, on-abnormal, on-abort or on-watchdog)")
createCmd.PersistentFlags().Uint64VarP(&createOpts.RestartSec, "restartsec", "s", 5, "How many seconds between restarts") createCmd.PersistentFlags().StringVarP(&createOpts.RestartSec, "restartsec", "s", "", "How many seconds between restarts")
createCmd.PersistentFlags().Uint64Var(&createOpts.TimeoutStartSec, "timeoutstartsec", 0, "How many seconds to wait for a startup") createCmd.PersistentFlags().StringVar(&createOpts.TimeoutStartSec, "timeoutstartsec", "", "How many seconds to wait for a startup")
createCmd.PersistentFlags().Uint64Var(&createOpts.TimeoutStopSec, "timeoutstopsec", 0, "How many seconds to wait when stoping a service") createCmd.PersistentFlags().StringVar(&createOpts.TimeoutStopSec, "timeoutstopsec", "", "How many seconds to wait when stoping a service")
createCmd.PersistentFlags().StringVarP(&createOpts.After, "after", "a", "", "Target after which the service will be started") createCmd.PersistentFlags().StringVarP(&createOpts.After, "after", "a", "", "Target after which the service will be started")
createCmd.PersistentFlags().StringVarP(&createOpts.WantedBy, "wantedby", "b", "", "This service is wanted by this target") createCmd.PersistentFlags().StringVarP(&createOpts.WantedBy, "wantedby", "b", "", "This service is wanted by this target")